6752920 Fix mismerge

Authored and Committed by mclasen 13 years ago
    Fix mismerge