Merge branch 'upstream_master'
Foxtons Web Design [Mon, 12 Apr 2010 08:29:44 +0000 (09:29 +0100)]

Trivial merge