87b1e47 Fix merge errors

Merged and Committed by bpepple 10 years ago
    Fix merge errors
    
        
file added
+22
file modified
+7 -1