bc7ca59 Update to current head.

Authored and Committed by thm 11 years ago
    Update to current head.
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1