139b75a fix another botched merge

Authored and Committed by rdieter 11 years ago
    fix another botched merge
    
        
file modified
+0 -12
file modified
+0 -4