[rpkg/f17: 2/2] Merge branch 'master' into f17

[Jesse Keating]

commit 90d68d8c667de9dc17f4f860933b4b6b87d978fe
Merge: 025e54a fa5faff
Author: Jesse Keating <jkeating at redhat.com>
Date:   Mon Mar 26 15:33:09 2012 -0700

    Merge branch 'master' into f17

 .gitignore |    1 +
 rpkg.spec  |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---