The conflict resolution I did on this file seems to have not been real keen. ;) Fixed.
Synced in changes from trunk, merged revs 234:235