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>

diff --cc options.c
index 66b57d7360b571b6450b8db4c762de24972a9aa2,e4c3c2ec9c5aa7fded069491b6847e8313a6b2cd..3aa68200e0b138b2a2b8ad9d1053cdb424fc45c9
--- 1/options.c
--- 2/options.c
+++ b/options.c
@@@ -48,8 -45,7 +48,9 @@@
  #include "pool.h"
  #include "helper.h"
  #include "manage.h"
+ #include "forward.h"
 +#include "configure.h"
 +#include <ctype.h>
  
  #include "memdbg.h"