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

Trivial merge