Merge branch 'upstream_master'
Foxtons Web Design [Fri, 16 Apr 2010 08:19:36 +0000 (09:19 +0100)]

Trivial merge