Merged r1473, r1476, r1477, r1478, r1481, r1482, r1484 to r1487, r1491 from trunk.
Authored by: jplang 2008-06-14
Parent: [r1527]
Child: [r1529]