Merge branch 'master' into tova
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 29 Sep 2008 22:11:32 +0000 (18:11 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 29 Sep 2008 22:11:32 +0000 (18:11 -0400)

Trivial merge