Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 8 Aug 2009 16:17:31 +0000 (12:17 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 8 Aug 2009 16:17:31 +0000 (12:17 -0400)

Trivial merge