Merge branch 'bugfix2.1' into beta2.2

Conflicts:
	options.c
	- Disagreements about a new included file (forward.h)

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

1 files changed, 1 insertions, 0 deletions

diff --git a/options.c b/options.c
index 66b57d7..3aa6820 100644
--- a/options.c
+++ b/options.c
@@ -48,6 +48,7 @@
 #include "pool.h"
 #include "helper.h"
 #include "manage.h"
+#include "forward.h"
 #include "configure.h"
 #include <ctype.h>