Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 30 Aug 2010 17:03:08 +0000 (13:03 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 30 Aug 2010 17:03:08 +0000 (13:03 -0400)

Trivial merge