Fixed an incorrectly repaired merge conflict from the previous revision of this branch.
Authored by: bugman 2013-03-11
Parent: [r18761]
Child: [r18763]