Merged r1399, r1403, r1405 and r1406 from trunk.
Authored by: jplang 2008-05-02
Parent: [r1406]
Child: [r1408]