Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 13 Jan 2011 23:47:56 +0000 (19:47 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 13 Jan 2011 23:47:56 +0000 (19:47 -0400)

Trivial merge