05fc44f Correct merge entry in changelog

Authored and Committed by bsjones 12 years ago
    Correct merge entry in changelog
    
        
file modified
+4 -1