[qyoto/f16: 7/7] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 8bf4f9519a69671a06282aaf3eba206e4d8f6a93
Merge: aa3d78b d03b631
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 22:37:36 2012 -0600

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

 .gitignore |    3 +--
 qyoto.spec |   39 +++++++++++++++++++++++++++++++++------
 sources    |    2 +-
 3 files changed, 35 insertions(+), 9 deletions(-)
---