Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 23 Sep 2008 23:34:14 +0000 (19:34 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 23 Sep 2008 23:34:14 +0000 (19:34 -0400)

Trivial merge