tree 6b59360c267508647ae4492f171668ef6ce82e32
parent 98ac62defe529d04a192688f40d801a2d8fbcf98
parent 9a40525788a1b692ee0fc780a8cdb2ac808de1b0
author Jeff Garzik <jgarzik@pobox.com> 1133660054 -0500
committer Jeff Garzik <jgarzik@pobox.com> 1133660054 -0500

Merge branch 'upstream-fixes'