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

[Jesse Keating]

commit c571de5486e2b143be486821e26ffed5242724a6
Merge: 73cb177 a5060f3
Author: Jesse Keating <jkeating at redhat.com>
Date:   Mon Aug 23 23:28:02 2010 -0700

    Merge branch 'master' into f12

 .gitignore           |    1 +
 fedora-packager.spec |   47 ++++++++++++++++++++++-------------------------
 sources              |    2 +-
 3 files changed, 24 insertions(+), 26 deletions(-)
---