b84bf02 sync with EL-5

Authored and Committed by rathann 16 years ago
    sync with EL-5
    
        
file removed
-315
file removed
-32
file modified
+9 -33