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

[Rex Dieter]

commit 83eb2249a17a93e7a93e6d8fcbd30d6beaa24ea0
Merge: 8e7b4eb cc1b913
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue May 1 07:14:02 2012 -0500

    Merge branch 'master' into f16

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