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

[Rex Dieter]

commit 2ef5caf1c5a283b13a30ac064f55b1174a8495e3
Merge: 65020fe 8c63447
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 6 20:39:40 2012 -0600

    Merge branch 'f18' into f17

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