7b21969 Update to latest upstream version

Authored and Committed by Richard Hughes 9 years ago
    Update to latest upstream version
    
        
file modified
+1 -0
file modified
+10 -7
file modified
+1 -1