Merged r2109, r2118, r2130, r2131, r2134, r2135, r2136 and r2139 to r2145 from trunk.
Authored by: jplang 2008-12-19
Parent: [r2145]
Child: [r2147]