Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 11 Dec 2009 03:19:19 +0000 (22:19 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 11 Dec 2009 03:19:19 +0000 (22:19 -0500)

Trivial merge