[kmplot/f17: 9/9] Merge branch 'master' into f17

[Rex Dieter]

commit 174bf746964f06c56372c1c5ffc74e3f434d8aee
Merge: ae7140b 9448dc2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 10 07:43:23 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	kmplot.spec
    	sources

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