c242ac1 Update to new upstream version

Authored and Committed by Richard Hughes 10 years ago
    Update to new upstream version
    
        
file modified
+1 -0
file modified
+13 -3
file modified
+1 -1