9192328 clean up from merge

Authored and Committed by jcollie 10 years ago
    clean up from merge
    
        
file modified
+11 -77