Merge branch 'master' of git.shadowcat.co.uk:HTML-Zoom
Simon Elliott [Mon, 13 Jun 2011 12:23:55 +0000 (13:23 +0100)]

Trivial merge