Merge branch 'upstream_master'
Foxtons Web Design [Thu, 6 May 2010 15:17:56 +0000 (16:17 +0100)]

Trivial merge