511b94d Merge branch 'master' into f15

Merged and Committed by itamarjp 13 years ago
    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore
    	qt-creator.spec
    	sources
    
        
file modified
+3 -1
file modified
+17 -2
file modified
+1 -1