ebe2c81 Merge remote-tracking branch 'origin/f17' into f16

Merged and Committed by rdieter 12 years ago
    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	ruby-qt.spec
    	sources
    
        
file modified
+1 -1
file modified
+55 -22
file modified
+1 -1