661eb91 Fix merging

Merged and Committed by bsjones 12 years ago
    Fix merging
    
        
file modified
+9 -2