tree 8c070070bb355843cfa4635643e9da7c2c4cd44a
parent b0c4e148bd591629749d02a8fbc8d81c26d548cf
parent 81cfb8864c73230eb1c37753aba517db15cf4d8f
author Jeff Garzik <jgarzik@pobox.com> 1130655498 -0500
committer Jeff Garzik <jgarzik@pobox.com> 1130655498 -0500

Merge branch 'upstream'