Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 9 Jun 2009 01:41:42 +0000 (21:41 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 9 Jun 2009 01:41:42 +0000 (21:41 -0400)

Trivial merge