Merged r1015, r1019, r1022 to r1025, r1045 and r1047 from trunk.
Authored by: jplang 2008-01-07
Parent: [r1047]
Child: [r1049]