Merge branch 'master' of git://git.shadowcat.co.uk/catagits/HTML-Zoom
Simon Elliott [Mon, 31 Jan 2011 16:34:44 +0000 (16:34 +0000)]

Trivial merge