7231083 Import fixes from upstream

Authored and Committed by fabbione 15 years ago
    Import fixes from upstream
    
        
file added
+82
file modified
+12 -2