Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Mon, 7 Aug 2006 10:43:17 +0000 (06:43 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 7 Aug 2006 10:43:17 +0000 (06:43 -0400)
commit38ebb1e0ed214efe124534eba4a34e869a0d8da7
tree3712611527654e81109d194d903401c86763e3f4
parent236a686b56428a8967a057a2396f9be74e2ee652
parent9f737633e6ee54fc174282d49b2559bd2208391d
Merge branch 'master' into upstream