c1fa166 Fix merge conflicts.

Merged and Committed by bpepple 13 years ago
    Fix merge conflicts.
    
        
file modified
+1 -0
file modified
+8 -4
file modified
+1 -1