493fa83 Merge with upstream

Authored and Committed by fnasser 17 years ago
    Merge with upstream
    
        
file modified
+36 -2