Merge branch 'master' into dependency-types
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 5 Oct 2009 20:47:40 +0000 (16:47 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 5 Oct 2009 20:47:40 +0000 (16:47 -0400)
commitff2aa982c3af4aede9ff0fdeafc617e0d3b15392
tree39135190f8ed2f92eae0b2fa82b98f4a39d36786
parentc21f9e70936566daaf06fff21349f4584ee42906
parent786dcf15c4117f9ae6b000318ac9809399df4d69
Merge branch 'master' into dependency-types