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

[Than Ngo]

commit 577f8cbc98be7696f19d3026691cfd7e54e81389
Merge: 52f44e9 c87d7ec
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:35:47 2012 +0100

    Merge branch 'f18' into f17

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