Merge branch 'tim-20120929-d-m' of git.shadowcat.co.uk:Devel-Size into tim-20120929-d-m
Tim Bunce [Fri, 28 Sep 2012 19:18:06 +0000 (04:18 +0900)]

Trivial merge