Merge branch 'master' into dependency-types
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 8 Oct 2009 00:02:43 +0000 (20:02 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 8 Oct 2009 00:02:43 +0000 (20:02 -0400)

Trivial merge