Merged r1451 to r1454, r1458, r1460 to r1463 from trunk.
Authored by: jplang 2008-05-29
Parent: [r1473]
Child: [r1475]