tree b79bcaabffa18847cab31efdf798dc5740e8d73b
parent bcd68373877e74d8ca5039c10dc5d699ba5dc7d0
parent 41ace1861a93f12f70ff10026fb1539fea38fcf8
author Jeff Garzik <jeff@garzik.org> 1156022747 -0400
committer Jeff Garzik <jeff@garzik.org> 1156022747 -0400

Merge branch 'upstream-fixes' into upstream