Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 20 Nov 2005 05:41:08 +0000 (00:41 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 20 Nov 2005 05:41:08 +0000 (00:41 -0500)
commit8238e747b62db977f80bfd4e5694d4fc2c1112d5
tree7ac1b125cf75752e7b49e99322f2c7d62076691d
parent85a07029aaba8f5b27241bcff56cc009c9f4993b
parent1b15688b31d8c88881102426279e8cc03953860b
Merge branch 'upstream'