Merged r2563, r2566, r2567, r2568, r2569, r2582 from trunk.
Authored by: jplang 2009-04-05
Parent: [r2649]
Child: [r2651]