tree 4d3e5a22b13e5a8ac3553fca1cedd9c689235138
parent 41232d3ecac9df8eb94ff27330eb84b8baccc6b7
parent 1fdffbce0332b3e00993d741e76935e7f4f0d40f
author Jeff Garzik <jgarzik@pobox.com> 1139480147 -0500
committer Jeff Garzik <jgarzik@pobox.com> 1139480147 -0500

Merge branch 'upstream'