3be53ac Merge fixup

Merged and Committed by jforbes 12 years ago
    Merge fixup
    
        
file modified
+1 -6
file modified
+4 -1