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

[Jesse Keating]

commit 896eb5bd617db2cdb6158770d69d46223d55f9c4
Merge: 74ede99 e2a17c0
Author: Jesse Keating <jkeating at redhat.com>
Date:   Tue Aug 24 14:42:40 2010 -0700

    Merge branch 'master' into f13

 .gitignore           |    1 +
 fedora-packager.spec |    6 +++++-
 sources              |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 196c58c,53bbd4d..6b3493e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,8 +1,3 @@@
 -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
+ /fedora-packager-0.5.1.4.tar.bz2