Merge branch 'master' of /home/git/random-fuzzer into thread-switch

diff --cc model.cc
Simple merge

diff --cc model.h
Simple merge

diff --cc mutex.cc
Simple merge

diff --cc pthread.cc
Simple merge

diff --cc threads-model.h
Simple merge

diff --cc threads.cc
Simple merge