tree feaf8a52abe154d492c2be23420ed157395ddcbb
parent 5f4f9dc113a7aedca072851f3a51cc563f8e143f
parent be0df20cb5ffd36ced9393d004e473d5c531b5da
author Jeff Garzik <jgarzik@pobox.com> 1133421767 -0500
committer Jeff Garzik <jgarzik@pobox.com> 1133421767 -0500

Merge branch 'upstream-fixes'