4122ef6 Merge 3.2-19 into F-7 and F-8.

Authored and Committed by Tomas Janousek 16 years ago
    Merge 3.2-19 into F-7 and F-8.
    
        
file modified
+15 -2