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

[Rex Dieter]

commit ed80e91a810f514768457500a8dd46fc6c006029
Merge: 6906db5 39cf89a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:03:08 2012 -0500

    Merge branch 'f18' into f17

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