447c082 Update to upstream r8642.

Authored and Committed by jussilehtola 14 years ago
    Update to upstream r8642.
    
        
file modified
+8 -2
file modified
+1 -1