Merge branch 'master' into dependency-types
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 4 Oct 2009 20:28:51 +0000 (16:28 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 4 Oct 2009 20:28:51 +0000 (16:28 -0400)
commitd5357374c9def3cee23d46595f61795e08f4cc0b
tree5d840075216bdfbd730fbad44bfffccc3f8e4b29
parenta8af271e5aed1c4aef3f66cee0847d609aedc705
parentcda8592a5fd5595d12f0503bfcd2e0640e0afc86
Merge branch 'master' into dependency-types