Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 25 Aug 2008 20:04:18 +0000 (16:04 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 25 Aug 2008 20:04:18 +0000 (16:04 -0400)

Trivial merge