d818a41 sync EL-4 and EL-5 branches with F-8

Authored and Committed by xavierb 16 years ago
    sync EL-4 and EL-5 branches with F-8
    
        
file modified
+11 -2
file modified
+1 -1