Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 12 Feb 2009 17:27:33 +0000 (12:27 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 12 Feb 2009 17:27:33 +0000 (12:27 -0500)

Trivial merge