[kiten/f17: 11/11] Merge branch 'master' into f17

[Rex Dieter]

commit 5ca7506cadd90920c0f09d586ca6ccc556142317
Merge: 21f2450 28430d5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 10 07:40:40 2012 -0500

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

 .gitignore |    6 +-----
 kiten.spec |   35 +++++++++++++++++++++++++++--------
 sources    |    2 +-
 3 files changed, 29 insertions(+), 14 deletions(-)
---