[kmplot/f16: 8/8] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit ba17821f6ca3071f06722e42df9b2269622bdb8a
Merge: d531a9a 9c32eb2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:45:44 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kmplot.spec
    	sources

 .gitignore  |    3 +--
 kmplot.spec |   29 +++++++++++++++++++++++++----
 sources     |    2 +-
 3 files changed, 27 insertions(+), 7 deletions(-)
---