* commit '23dfa00b':
  fate: explicitly set the default THREADS value

Conflicts:
	tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>