Merged r3348 from trunk (version set to 0.9.1).
Authored by: jplang 2010-01-30
Parent: [r3348]
Child: [r3350]
