Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 1 Jun 2010 00:46:32 +0000 (20:46 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 1 Jun 2010 00:46:32 +0000 (20:46 -0400)

Trivial merge