Merged r2110 to r2112 (diff limit) from trunk.
Authored by: jplang 2008-12-12
Parent: [r2131]
Child: [r2133]