Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 24 Jan 2011 20:32:29 +0000 (16:32 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 24 Jan 2011 20:32:29 +0000 (16:32 -0400)

Trivial merge