0479b7 Fix merge error.

Authored and Committed by Peter Jones 12 years ago
1 file changed. 3 lines added. 5 lines removed.
    Fix merge error.
    
        
file modified
+3 -5