Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Wed, 20 Sep 2006 04:48:28 +0000 (00:48 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 20 Sep 2006 04:48:28 +0000 (00:48 -0400)
commit783c99f42e221217761e9c319838d5533107f7cb
treeff09cb67fc0875450e83906af887fe219bc99c53
parentf8ec473387f70d103c83ffb3ab50cb2b1380d0c0
parente478bec0ba0a83a48a0f6982934b6de079e7e6b3
Merge branch 'master' into upstream