Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 2 Dec 2009 17:58:59 +0000 (12:58 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 2 Dec 2009 17:58:59 +0000 (12:58 -0500)

Trivial merge