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

[Jesse Keating]

commit 8dc08feb06658053051d6f42e7cf09733ade9e24
Merge: ce11bd2 3a45098
Author: Jesse Keating <jkeating at redhat.com>
Date:   Mon Mar 12 16:30:14 2012 -0700

    Merge branch 'master' into f15

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