0d5aa9f Fix merge conflicts

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