Merge branch 'master' into upstream
commit3b9f6cb8a1ec791be79c6c7595fea922f12d1e64
authorJeff Garzik <jeff@garzik.org>
Wed, 27 Sep 2006 22:16:47 +0000 (27 18:16 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 27 Sep 2006 22:16:47 +0000 (27 18:16 -0400)
tree2393a448add846e6c2ed12f68106c3018b72c6a9
parentc38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa
parenta77c64c1a641950626181b4857abb701d8f38ccc
Merge branch 'master' into upstream