2ebb1af Rebase to new snapshot with some fixes integrated

Authored and Committed by toshio 11 years ago
    Rebase to new snapshot with some fixes integrated
    
    - Reenable one test that I can't replicate the failure with.
    
        
file modified
+0 -20
file modified
+15 -22
file modified
+1 -1