Merge branch 'master' of git://git.ikiwiki.info
authorSimon McVittie <http://smcv.pseudorandom.co.uk/>
Sun, 13 Jul 2008 14:32:40 +0000 (15:32 +0100)
committerSimon McVittie <http://smcv.pseudorandom.co.uk/>
Sun, 13 Jul 2008 14:32:40 +0000 (15:32 +0100)

Trivial merge