Merge branch 'upstream_master'
Foxtons Web Design [Wed, 21 Apr 2010 14:05:15 +0000 (15:05 +0100)]

Trivial merge