Merged changes from the trunk into the branch
Authored by: jimwinston 2010-06-21
Parent: [r835]
Child: [r837]