tree 6f977546112ccbd617ef40ae38a1ca558d71bce9
parent 332b5a52f2f96bc2d13bbe594a430318c0ee4425
parent 8a19ac89edbe9b702c10fd2039b8cb2db4644a5f
author Jeff Garzik <jgarzik@pobox.com> 1139477293 -0500
committer Jeff Garzik <jgarzik@pobox.com> 1139477293 -0500

Merge branch 'upstream'