Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 3 May 2010 20:03:06 +0000 (16:03 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 3 May 2010 20:03:06 +0000 (16:03 -0400)

Trivial merge