Release 1.20.2:
Merge branch 'master' into no_french.
Authored by: Tony Houghton 2010-12-20
Parents: [2c12d2][d40404]
Child: [6e2d7c]