8339700 Backport fixes from 3.0.3

Authored and Committed by kwizart 16 years ago
    Backport fixes from 3.0.3
    
        
file modified
+6 -1