Merge branch 'feat_misc' into beta2.2

Conflicts:
	acinclude.m4
	config-win32.h
	configure.ac
	misc.c
	thread.c
	thread.h
        - These conflicts was mainly due to feat_misc getting old
          and mostly caused by the pthread clean-up patches in
          feat_misc

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>

1 files changed, 0 insertions, 1 deletions

diff --git a/otime.h b/otime.h
index 74597e3..fd73bbd 100644
--- a/otime.h
+++ b/otime.h
@@ -28,7 +28,6 @@
 #include "common.h"
 #include "integer.h"
 #include "buffer.h"
-#include "thread.h"
 
 struct frequency_limit
 {