Updated with details of recent changes.
Authored by: delphidabbler 2011-06-12
Parent: [r1486]
Child: [r1488]
