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

[Rex Dieter]

commit 061929233a9d2e5b7cf82f56aa117d9ffff7215f
Merge: db283fa c55f0e7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:26:36 2012 -0500

    Merge branch 'f17' into f16

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