212ca6d Merge branch 'master' into f14

Merged and Committed by luya 13 years ago
    Merge branch 'master' into f14
    
    Conflicts:
    	gdesklets.spec
    
        
file modified
+1 -0
file modified
+11 -5
file modified
+1 -1