[fedora-packager/f13/master: 18/18] Merge branch 'master' into f13

[Dennis Gilmore]

commit 32b8d352d418ebd1a0ba6e323ea93be18ed583b0
Merge: 7cd64c5 8415c56
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Thu Aug 12 13:28:08 2010 -0500

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	fedora-packager.spec
    	sources

 .gitignore           |    6 +-----
 fedora-packager.spec |    6 +++++-
 sources              |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index 3adbab8,768e000..b3f1542
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,6 +1,1 @@@
--fedora-packager-0.4.2.3.tar.bz2
--fedora-packager-0.5.0.tar.bz2
--fedora-packager-0.5.0.1.tar.bz2
--fedora-packager-0.5.1.0.tar.bz2
--fedora-packager-0.5.1.1.tar.bz2
+ fedora-packager-0.5.1.2.tar.bz2