Merge branch 'foxtons-frontend'
Dan Brook [Fri, 2 Apr 2010 23:08:31 +0000 (00:08 +0100)]

Trivial merge