302af06 Merge branch 'master' into f17

Merged and Committed by rdieter 11 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	marble.spec
    	sources
    
        
file modified
+1 -2
marble-4.8.80-opt.patch marble-4.8.0-opt.patch
file renamed
+13 -13
file modified
+34 -7
file modified
+1 -1