Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 22 Jan 2009 04:04:48 +0000 (23:04 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 22 Jan 2009 04:04:48 +0000 (23:04 -0500)

Trivial merge