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

[Jesse Keating]

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

    Merge branch 'master' into f16

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