33fdf3e - merge back changes that got lost

Authored and Committed by katzj 16 years ago
    - merge back changes that got lost
    
        
file modified
+38 -6