Merge error, dual copies in file. Merge fixed.
Authored by: pheonixstorm 2010-12-14
Parent: [r12974]
Child: [r12976]