f619483 Update to upstream release.

Authored and Committed by Xavier Lamien 11 years ago
    Update to upstream release.
    Add mtasaka changes request as well.
    
        
file modified
+34 -17
file modified
+1 -1