1399cb1 Updated to new upstream release

Authored and Committed by musuruan 12 years ago
    Updated to new upstream release
    
    - More consistent macro usage
    
        
file modified
+1 -0
file modified
+10 -12
file modified
+1 -1