0479b73 Fix merge error.

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