Brought in line with changed headers
Authored by: andy_rushton 2011-01-12
Parent: [r426]
Child: [r428]