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

[Rex Dieter]

commit 48fc6d14c16e2eb642255071ce2e24404780a17b
Merge: 30419bc cb2bf4b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 6 20:31:46 2012 -0600

    Merge branch 'f18' into f17

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