Updated with details of recent changes.
Authored by: delphidabbler 2011-10-28
Parent: [r1653]
Child: [r1655]
