[BitchX/f17: 24/24] Merge branch 'master' into f17

[Dan Mashal]

commit b527a2af00b2e04c5d499d992aab1ec2ef577ad3
Merge: ef94317 aef761e
Author: Dan Mashal <vicodan at fedoraproject.org>
Date:   Tue May 15 07:27:29 2012 -0700

    Merge branch 'master' into f17
    
    Conflicts:
    	BitchX.spec
    	sources

 BitchX.spec |    6 +++++-
 sources     |    4 ++++
 2 files changed, 9 insertions(+), 1 deletions(-)
---
diff --cc sources
index 9b45604,1d8a9e1..d59cd3f
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +fc0fb2efe704971bc8ab58584752dcf4  BitchX1.2.tar.gz
++=======
+ 1c5640e06fbaad95d077c599d8789109  BitchX1.2.tar.gz
++>>>>>>> master