6f4c4b4 update to latest upstream release, various fixes

Authored and Committed by mmorsi 12 years ago
    update to latest upstream release, various fixes
    
        
file modified
+1 -0
file modified
+9 -14
file modified
+1 -1