4ff5296 Fix merge conflicts

Merged and Committed by bpepple 12 years ago
    Fix merge conflicts
    
        
file modified
+7 -4