6a805b2 fix merge

Merged and Committed by pbrobinson 12 years ago
    fix merge
    
        
file modified
+10 -7