ca8eefe synchronize with upstream git

Authored and Committed by ovasik 15 years ago
    synchronize with upstream git
    
        
file modified
+1 -1
file removed
-190
file modified
+6 -7
file modified
+1 -1