Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 29 Nov 2005 08:57:16 +0000 (03:57 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 29 Nov 2005 08:57:16 +0000 (03:57 -0500)
commit5e3c2b95dd560baa41b08c8f5f00bbd6fbeebdcb
tree639d83b9bc4d08104e014b8903a773a04b7f1cac
parent4fe1eaf6f39ed3270aff6068d84a2e6a452da734
parentb71d4da092801634d04190693a38ca03bdbe2505
Merge branch 'upstream'