Merged r4784 from trunk (update for 1.1.1 release).
Authored by: jplang 2011-01-30
Parent: [r4784]
Child: [r4786]