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

[Than Ngo]

commit fb1da7d24e070f523b309434bb2b8435a66c13fb
Merge: d368a58 54ced3c
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:37:36 2012 +0100

    Merge branch 'f18' into f17

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