ad36a63 Merge branch 'master' into f15

Merged and Committed by pali 12 years ago
    Merge branch 'master' into f15
    
        
file modified
+2 -1
file modified
+13 -6
file modified
+1 -0