Merged r2246 and r2248 from trunk (#2456).
Authored by: jplang 2009-01-24
Parent: [r2309]
Child: [r2311]