Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 13 Jun 2010 12:49:32 +0000 (08:49 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 13 Jun 2010 12:49:32 +0000 (08:49 -0400)

Trivial merge