Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 20 Dec 2010 19:11:53 +0000 (15:11 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 20 Dec 2010 19:11:53 +0000 (15:11 -0400)

Trivial merge