tree 433a88c55ac4713e9d839a9589728ac4dd142afd
parent 0486a8c83b0f83c52c4d93accd841e08ccdf04dc
parent 519854876c66bd04b0c12d3cead6e0e5fc5a1167
author Jeff Garzik <jeff@garzik.org> 1157980457 -0400
committer Jeff Garzik <jeff@garzik.org> 1157980457 -0400

Merge branch 'upstream-fixes' into upstream