feed1a4 Fix merge conflicts

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