Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

changes/bug2313

@@ -0,0 +1,4 @@
+  o Minor bugfixes
+    - Fix compilation on mingw when a pthreads compatibility library
+      has been installed.  (We don't want to use it, so we shouldn't
+      be including pthread.h.)  Fixes bug 2313; bugfix on 0.1.0.1-rc.

src/common/compat.h

@@ -31,7 +31,7 @@
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_PTHREAD_H
+#if defined(HAVE_PTHREAD_H) && !defined(MS_WINDOWS)
 #include <pthread.h>
 #endif
 #include <stdarg.h>