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

[Rex Dieter]

commit 7d716e01a674e86b0dbcb8b705c785e9064bd3b8
Merge: 320c567 682a788
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 10 07:41:15 2012 -0500

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

 .gitignore    |    3 +--
 klettres.spec |   25 ++++++++++++++++++++-----
 sources       |    2 +-
 3 files changed, 22 insertions(+), 8 deletions(-)
---