Merged r3249 to r3252 and r3254 from trunk.
Authored by: jplang 2009-12-27
Parent: [r3254]
Child: [r3256]