[ruby-qt/f16: 13/13] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit ebe2c813584ff9622fe6c172c468090e545cde64
Merge: 2131680 d3f2bc1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 22:36:50 2012 -0600

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

 .gitignore   |    2 +-
 ruby-qt.spec |   77 +++++++++++++++++++++++++++++++++++++++++----------------
 sources      |    2 +-
 3 files changed, 57 insertions(+), 24 deletions(-)
---