Merge branch 'upstream-fixes' into upstream
commit38ed61d6c0b2c35fbaa1ccdb497543a18509d401
authorJeff Garzik <jeff@garzik.org>
Wed, 13 Sep 2006 16:26:12 +0000 (13 12:26 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 13 Sep 2006 16:26:12 +0000 (13 12:26 -0400)
treed7be64b244119ccfb346d3cea7124bbc2135603e
parent4291130595065aa3c9fbb9130231f65e4914629a
parent71d28725548be203e8b8f6ad63b1f64fd7f02d4d
Merge branch 'upstream-fixes' into upstream