Merge the profile branch into the trunk. This isn't a Subversion sanctified merge because Subversion refused to do its job. Rather, the code was manually copied from the branch to the trunk.
Authored by: jimwinston 2010-06-01
Parent: [r805]
Child: [r807]