tree f683950f737fea82e55153209ef34a4089285abc
parent a2413598b8c5f14d75f914ce95d72bacdeabd05e
parent d279490543ee4e7c51371eb605b578ab47f45305
author Jeff Garzik <jeff@garzik.org> 1157555204 -0400
committer Jeff Garzik <jeff@garzik.org> 1157555204 -0400

Merge branch 'upstream-fixes' into upstream