Merged bug fixes r3402, r3405 to r3408 from trunk.
Authored by: jplang 2010-02-14
Parent: [r3430]
Child: [r3432]