[RBTools/f13/master: 9/9] Merge branch 'master' into f13

[Stephen Gallagher]

commit 234b238a55bc4314b577e79eb96d7d1679fc4e73
Merge: ddfaf49 c3e3255
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Feb 7 14:17:21 2011 -0500

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	RBTools.spec
    	sources

 .gitignore   |    4 +++-
 RBTools.spec |   26 +++++++++++++++++++++-----
 sources      |    2 +-
 3 files changed, 25 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index c290b6d,23409fc..cae930e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -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