Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 6 Aug 2011 16:31:23 +0000 (12:31 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 6 Aug 2011 16:31:23 +0000 (12:31 -0400)

Trivial merge