[qyoto/f17: 9/9] Merge branch 'master' into f17

[Rex Dieter]

commit 3c39ea9755aafe7f5e68e24b9d16b5e83f3f186f
Merge: 4ce0b2c 77c10c8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Sep 5 10:28:30 2012 -0500

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

 .gitignore |    3 +--
 qyoto.spec |   25 ++++++++++++++++++++-----
 sources    |    2 +-
 3 files changed, 22 insertions(+), 8 deletions(-)
---