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

[Rex Dieter]

commit 65020fe01dd04eb5a7e5f9d9799fe2d20cd76db3
Merge: 5ca7506 db0c212
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:03:20 2012 -0500

    Merge branch 'f18' into f17

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