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

[Dennis Gilmore]

commit 547c8258a6bd88f49e1d788ec68db06e76d19e58
Merge: 52cc316 8415c56
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Thu Aug 12 13:30:47 2010 -0500

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

 .gitignore           |    3 ++-
 fedora-packager.spec |    6 +++++-
 sources              |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 973c120,768e000..aa061ec
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,5 +1,4 @@@
--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