[fedpkg/f15: 3/3] Merge branch 'master' into f15

[Jesse Keating]

commit ce11bd21aa2c5691bbc9e1722d68e523259b5541
Merge: b89b1dd d509049
Author: Jesse Keating <jkeating at redhat.com>
Date:   Thu Mar 1 16:51:59 2012 -0800

    Merge branch 'master' into f15

 .gitignore  |    1 +
 fedpkg.spec |   13 +++++++++++--
 sources     |    2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
---