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

[Rex Dieter]

commit 388cbbb1107270c857a28a095d8e0ec820ede228
Merge: 83eb224 7db0131
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:22:12 2012 -0500

    Merge branch 'f17' into f16

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