Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Tue, 2 May 2006 19:26:21 +0000 (15:26 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 2 May 2006 19:26:21 +0000 (15:26 -0400)
commit753a6c4ff4c371a3e4e3408aaba4d03f3cfde73a
treeb55e9d7a5d4ef746f38a10614bf01c2ab2dacd42
parent5d3213cc8f4d6244b76ee0c4ab73a97d5d2ee956
parentebf34c9b6fcd22338ef764b039b3ac55ed0e297b
Merge branch 'upstream-fixes' into upstream