Merged r3727 from trunk for 0.9.4 release.
Authored by: jplang 2010-05-01
Parent: [r3727]
Child: [r3729]