de9537c Merge branch 'master' into f15

Merged and Committed by Stanislav Ochotnicky 13 years ago
    Merge branch 'master' into f15
    
    Conflicts:
    	google-gson.spec
    
        
file modified
+9 -4