(cherry picked from commit ddfbaea04ac415ce036350e3f2244b6f6bb881dc)

Conflicts:

	include/vlc_threads.h
	src/misc/threads.c