Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 20 Nov 2010 18:54:51 +0000 (14:54 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 20 Nov 2010 18:54:51 +0000 (14:54 -0400)

Trivial merge