Merge branch 'master' of git://git.ikiwiki.info
authorJon Dowland <jon@alcopop.org>
Mon, 10 Nov 2008 23:35:00 +0000 (23:35 +0000)
committerJon Dowland <jon@alcopop.org>
Mon, 10 Nov 2008 23:35:00 +0000 (23:35 +0000)

Trivial merge