Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Oct 2009 18:26:45 +0000 (14:26 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Oct 2009 18:26:45 +0000 (14:26 -0400)

Trivial merge