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

[Than Ngo]

commit cddef7154c9fc1d563034b2e7c771d96442739c6
Merge: 48fc6d1 3779edc
Author: Than Ngo <than at redhat.com>
Date:   Fri Dec 7 10:36:30 2012 +0100

    Merge branch 'f18' into f17

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