Merge branch '8139-thread'

This commit is contained in:
Jeff Garzik 2005-11-11 22:47:41 -05:00
commit 5d06b6bef9