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

[Rex Dieter]

commit 21c53729683df027047fcbb356b677c535623549
Merge: 0619292 e67f017
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 06:52:17 2012 -0500

    Merge branch 'f17' into f16

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