Merged r2797, r2804, r2814, r2820, r2837, r2838 from trunk.
Authored by: jplang 2009-09-13
Parent: [r2880]
Child: [r2882]