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

[Jesse Keating]

commit 025e54acd3c2a11c38200a2f1645d983e3577a74
Merge: 94b7b1e c5d4be7
Author: Jesse Keating <jkeating at redhat.com>
Date:   Wed Mar 21 16:57:37 2012 -0700

    Merge branch 'master' into f17

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