Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info into tova
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 1 Jul 2008 22:41:47 +0000 (18:41 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 1 Jul 2008 22:41:47 +0000 (18:41 -0400)

Trivial merge