Merged r2270, r2344, r2359, r2360, r2362, r2363, r2415, r2423, r2424 from trunk.
Authored by: jplang 2009-02-09
Parent: [r2424]
Child: [r2426]