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

[Rex Dieter]

commit ba4709c077399324957120825dc846076e7c7fb9
Merge: 123cc03 d2cfe7b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:14:51 2012 -0500

    Merge branch 'f17' into f16

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