8a0fd4d Import 2.6 from upstream

Authored and Committed by Ruediger Landmann 12 years ago
    Import 2.6 from upstream
    
        
file modified
+1 -0
file modified
+871 -11
file modified
+1 -1