Merged r2487, r2488 and r2507 from trunk.
Authored by: jplang 2009-02-22
Parent: [r2513]
Child: [r2515]