Merged r2262, r2341 and r2486 from trunk.
Authored by: jplang 2009-02-21
Parent: [r2512]
Child: [r2514]