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

[Rex Dieter]

commit 672a89cf4118d0d9d204fb7e3138e13a338528e9
Merge: 0462d9d cea48c7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:42:31 2012 -0600

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

 .gitignore |    3 +--
 kiten.spec |   36 +++++++++++++++++++++++++++++++-----
 sources    |    2 +-
 3 files changed, 33 insertions(+), 8 deletions(-)
---