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

[Jesse Keating]

commit b4944d05b3ec45d49d1ece06010605eb6165fbb0
Merge: c571de5 e2a17c0
Author: Jesse Keating <jkeating at redhat.com>
Date:   Tue Aug 24 14:44:08 2010 -0700

    Merge branch 'master' into f12

 .gitignore           |    1 +
 fedora-packager.spec |    6 +++++-
 sources              |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---