Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Mon, 24 Jul 2006 07:38:25 +0000 (03:38 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 24 Jul 2006 07:38:25 +0000 (03:38 -0400)
commit48cb37bd9e053429aacb7c2726da3300aba60c68
treeb96346400d0d36557d683bc1535ed5139f9ca76d
parente36fcd8ae611b91f0bbaf6063b0b98e1ef955880
parentb71426eb10d904d421b36f51f93c8d0ba558edac
Merge branch 'upstream-fixes' into upstream