cleanup; branch was merged to trunk a while ago
Authored by: cwilper 2010-12-10
Parent: [r8853]
Child: [r8855]