1e73313 Update to upstream 2.6.

Authored and Committed by akurtakov 14 years ago
    Update to upstream 2.6.
    
        
file modified
+1 -0
file modified
+195 -108
file added
+13
file added
+13
file modified
+1 -1