3ff7e08 merged changes from el to allow fast-forward merge

Authored and Committed by rebus 13 years ago
    merged changes from el to allow fast-forward merge
    
        
file modified
+13 -3