Merged r2697, r2720, r2723, r2724, r2727, r2745 from trunk.
Authored by: jplang 2009-05-17
Parent: [r2745]
Child: [r2747]