[RBTools/el5/master: 3/3] Merge branch 'master' into el5

[Stephen Gallagher]

commit 07d96c4d9a50389681ad0416c5ef49cb865cce6e
Merge: 099aa67 c3e3255
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Feb 7 14:19:10 2011 -0500

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore

 .gitignore   |    3 +++
 RBTools.spec |   10 ++++++++--
 sources      |    2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index e69de29,23409fc..cae930e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,0 -1,3 +1,3 @@@
 -RBTools-0.2.tar.gz
++/RBTools-0.2.tar.gz
+ /RBTools-0.3.tar.gz
+ /RBTools-0.3.1.tar.gz