Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 18:47:42 +0000 (14:47 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 18:47:42 +0000 (14:47 -0400)

Trivial merge