Merge branch 'upstream_master'
Foxtons Web Design [Wed, 7 Apr 2010 12:42:16 +0000 (13:42 +0100)]

Trivial merge