[BitchX/f15: 5/5] Merge branch 'master' into f15

[Dan Mashal]

commit 3118cb6536616ac5635b5211637cfcb2c16c67ea
Merge: 1e14b08 8b65cee
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Tue May 29 21:21:49 2012 -0700

    Merge branch 'master' into f15
    
    Conflicts:
    	BitchX.spec

 BitchX.spec |    5 ++++-
 sources     |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---