4eeaed2 Rebase to r1010.

Authored and Committed by tagoh 12 years ago
    Rebase to r1010.
    
        
file modified
+26 -32
file modified
+6 -3