0673b70 fixes for merge review bz 225673

Authored and Committed by Steve Conklin 16 years ago
    fixes for merge review bz 225673
    
        
file modified
+15 -12