Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 29 Jan 2009 19:45:58 +0000 (14:45 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 29 Jan 2009 19:45:58 +0000 (14:45 -0500)

Trivial merge