[klettres/f16: 9/9] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 1954ee301ce7d0240161ad4f870261094c57e6b1
Merge: 60f0216 a9f0b28
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:43:27 2012 -0600

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

 .gitignore    |    3 +--
 klettres.spec |   37 ++++++++++++++++++++++++++++++-------
 sources       |    2 +-
 3 files changed, 32 insertions(+), 10 deletions(-)
---