Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 26 Dec 2010 17:55:35 +0000 (13:55 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 26 Dec 2010 17:55:35 +0000 (13:55 -0400)

Trivial merge