Merged to new trunk.

diff --cc src/threads/posix/thread-posix.c
Simple merge

diff --cc src/threads/posix/thread-posix.h
Simple merge

diff --cc src/threads/thread.h
Simple merge