4ad545d Fix merge conflicts

Merged and Committed by bpepple 12 years ago
    Fix merge conflicts
    
        
file modified
+1 -0
file modified
+6 -6
file modified
+1 -1