Properly removed the conflict of r14287.
Authored by: bugman 2011-08-09
Parent: [r14287]
Child: [r14289]