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

[Than Ngo]

commit 3cc0ba39663a32feaa3d5794dc95a9d2718d14cf
Merge: ed80e91 c718349
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:37:04 2012 +0100

    Merge branch 'f18' into f17

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