tree c62f64f0c7e446cd11a2092fd101e75a1cfa38a2
parent e714d99cacac976deac3239c89f2c9e3125649b6
parent 8d3d35b4e20dc2e678fc7cb51165905b5a32fb76
author Jeff Garzik <jeff@garzik.org> 1155213063 -0400
committer Jeff Garzik <jeff@garzik.org> 1155213063 -0400

Merge branch 'upstream-fixes' into upstream