Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 4 Jun 2008 15:30:59 +0000 (11:30 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 4 Jun 2008 15:30:59 +0000 (11:30 -0400)

Trivial merge