a9184c8 avoid conflict

Authored and Committed by mclasen 13 years ago
    avoid conflict
    
        
file modified
+24 -29