92c3d0f Merge branch 'master' into f18

Merged and Committed by Sami Wagiaalla 11 years ago
    Merge branch 'master' into f18
    
    Conflicts:
    	eclipse-linuxtools.spec
    
        
file modified
+22 -15