8a7e27b Merge from master, and fix conflicts

Merged and Committed by Richard Hughes 13 years ago
    Merge from master, and fix conflicts
    
        
file modified
+2 -0
file modified
+11 -6
file modified
+1 -1