Merged r2574, r2578, r2589, r2615, r2641, r2645, r2646 from trunk.
Authored by: jplang 2009-04-05
Parent: [r2650]
Child: [r2652]