[kimono/f16: 6/6] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 4d7a4fba6e3b583e1df563b24757c7e345cb7714
Merge: 5ba68e0 6a4e356
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 23:40:40 2012 -0600

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

 .gitignore  |    2 +-
 kimono.spec |   35 +++++++++++++++++++++++++++++------
 sources     |    2 +-
 3 files changed, 31 insertions(+), 8 deletions(-)
---