88771f1 Merge branch 'master' into f15

Merged and Committed by volter 12 years ago
    Merge branch 'master' into f15
    
    Conflicts:
    	grass.spec
    
        
file removed
-15
file removed
-11
file modified
+4 -25
file modified
+134 -108