3620fe4 Merge branch 'master' into f13

Merged and Committed by stingray 12 years ago
    Merge branch 'master' into f13
    
        
file added
+73
file modified
+16 -1
file added
+4