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

[Jesse Keating]

commit 74ede99d48f1ff09f77673c9bca88d5dd0e8e0a2
Merge: 222a1c6 a5060f3
Author: Jesse Keating <jkeating at redhat.com>
Date:   Mon Aug 23 23:27:34 2010 -0700

    Merge branch 'master' into f13

 .gitignore           |    1 +
 fedora-packager.spec |   47 ++++++++++++++++++++++-------------------------
 sources              |    2 +-
 3 files changed, 24 insertions(+), 26 deletions(-)
---
diff --cc .gitignore
index b3f1542,bad83d8..196c58c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,7 +1,2 @@@
 -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
+ /fedora-packager-0.5.1.3.tar.bz2