Merge branch 't0m'
Dan Brook [Thu, 3 Sep 2009 09:23:53 +0000 (10:23 +0100)]

Trivial merge