Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 26 Mar 2010 16:59:57 +0000 (12:59 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 26 Mar 2010 16:59:57 +0000 (12:59 -0400)

Trivial merge