2186911 Merge remote-tracking branch 'origin/master' into f16

Merged and Committed by rdieter 12 years ago
    Merge remote-tracking branch 'origin/master' into f16
    
    Conflicts:
    	.gitignore
    	sources
    	tomahawk.spec
    
        
file modified
+1 -2
file modified
+1 -1
file modified
+8 -3