Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 31 Jan 2006 16:52:21 +0000 (11:52 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 31 Jan 2006 16:52:21 +0000 (11:52 -0500)
commita03b1950521466e007288a25c9fc7ac7f05a97e5
treed1e9486b6e21bde1d80113ce9abe933e51364826
parent0b310f36d7d96e27f6941ec0f9b95e15142f1e78
parentc6f0d75a2defe8c7d8bf9f78de891cedc46b4b3e
Merge branch 'upstream-fixes'