e160ee2 update to latest HEAD

Authored and Committed by James Antill 10 years ago
    update to latest HEAD
    
    - Workaround for weird mash issue, probably.
    
        
file modified
+30 -20
file modified
+5 -1