tree 4567aef3fb7d081cb7d7b7c9bcd94e0e44d39557
parent 587005de144acd3007b8e7f2a2a7c6add157c155
parent f1b318793dcd2d9ff6b5ac06e7762098fa079cee
author Jeff Garzik <jgarzik@pobox.com> 1139807628 -0500
committer Jeff Garzik <jgarzik@pobox.com> 1139807628 -0500

Merge branch 'upstream'