Merged r2515, r2516, r2527, r2534, r2555 from trunk.
Authored by: jplang 2009-03-07
Parent: [r2555]
Child: [r2557]