Merged r1385 and r1426 to r1434 from trunk.
Authored by: jplang 2008-05-18
Parent: [r1436]
Child: [r1438]