5019d37 Update to upstream

Authored and Committed by mgrepl 13 years ago
    Update to upstream
    
        
file modified
+545 -603