Merged r1505, r1506, r1511, r1512, r1517, r1518, r1524 to 1526 from trunk.
Authored by: jplang 2008-06-14
Parent: [r1531]
Child: [r1533]