merged threading branch back into head
Authored by: skyebend 2007-12-05
Parent: [r133]
Child: [r135]