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

[Rex Dieter]

commit 222c926aad463202f3af87213ddaf240ebb3d75a
Merge: c820b0d 191878c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 13:56:27 2012 -0500

    Merge branch 'master' into f16

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