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

[Rex Dieter]

commit 123cc0397e37f448d60c9fcac3bbe30bbc20fbd9
Merge: 222c926 f80ed6c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 22:54:35 2012 -0500

    Merge branch 'master' into f16

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