Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 2 Mar 2011 16:40:57 +0000 (12:40 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 2 Mar 2011 16:40:57 +0000 (12:40 -0400)

Trivial merge