0699026 Merge branch 'master' into f14

Merged and Committed by madko 13 years ago
    Merge branch 'master' into f14
    
        
file modified
+11 -4