tree 241e690a9b7957d48b6069940871f37aa9c7df5a
parent c67eebd67400c4c2ae1389317f1de0cbb3b7a1ca
parent 357eb4cf75fdb9dbe46b64d50f3670de6a45dc91
author Jeff Garzik <jeff@garzik.org> 1156394527 -0400
committer Jeff Garzik <jeff@garzik.org> 1156394527 -0400

Merge branch 'upstream-fixes' into upstream