Merged r2463, r2465, r2467, r2468 from trunk.
Authored by: jplang 2009-02-15
Parent: [r2468]
Child: [r2470]