tree d1653e1a4cbe360aa7132ea4e29ab92a02038224
parent 61420e147a706ee7c7a902008045547fb2a2a330
parent 1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9
author Jeff Garzik <jgarzik@pobox.com> 1137511746 -0500
committer Jeff Garzik <jgarzik@pobox.com> 1137511746 -0500

Merge branch 'upstream'