Merge branch 'upstream_master'
Foxtons Web Design [Tue, 20 Apr 2010 16:51:10 +0000 (17:51 +0100)]

Trivial merge