Merged r1442, r1443 and r1446 to r1449 from trunk.
Authored by: jplang 2008-05-25
Parent: [r1449]
Child: [r1451]