Merge pull request #178 from Alexpux/develop

Winpthreads moved to trunk
revert to use make_cvs instead of make_git