Merge branch 'master' into no_french
Authored by: Tony Houghton 2010-12-30
Parents: [379a94][c8ed55]
Child: [f57b7b]