Merge remote branch 'foxtons/master' into foxtons 0.000006
Dan Brook [Wed, 14 Apr 2010 13:58:40 +0000 (14:58 +0100)]

Trivial merge