Merged r3392 from trunk (0.9.2 update).
Authored by: jplang 2010-02-07
Parent: [r3392]
Child: [r3394]