Merged r2722, r2771, r2772 from trunk.
Authored by: jplang 2009-09-13
Parent: [r2882]
Child: [r2884]