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

[Than Ngo]

commit e29e829d4636779784851990da66a1f2d37afa35
Merge: df99548 46a5d42
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:38:58 2012 +0100

    Merge branch 'f18' into f17

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