2d2a34f Updated to latest upstream version

Authored and Committed by tradej 11 years ago
    Updated to latest upstream version
    
    - Fixed and reenabled tests
    
        
file modified
+11 -4