Merge branch 'master' into no_french
Authored by: Tony Houghton 2010-12-22
Parents: [6e2d7c][9c08e1]
Children: [a9f6ea][c8ed55]