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

[Rex Dieter]

commit 84b362357706e6158e54024e87b6af8576862f7c
Merge: 2a1bc05 4a9684e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 10 07:41:46 2012 -0500

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

 .gitignore |    5 +----
 kmag.spec  |   25 ++++++++++++++++++++-----
 sources    |    2 +-
 3 files changed, 22 insertions(+), 10 deletions(-)
---