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

Trivial merge