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

[Rex Dieter]

commit f6f4d45ea29559dcaf4efabf41708ef822be896d
Merge: 1b8ec8a cf56364
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:47:56 2012 -0600

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

 .gitignore  |    3 +--
 kruler.spec |   32 ++++++++++++++++++++++++++------
 sources     |    2 +-
 3 files changed, 28 insertions(+), 9 deletions(-)
---