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

Trivial merge