Merge branch 'svn-BETA21' into beta2.2

Conflicts:
	version.m4
	- Reset version.m4 to a more neutral version number

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

diff --cc misc.c
Simple merge

diff --cc misc.h
Simple merge

diff --cc push.c
Simple merge

diff --cc ssl.c
Simple merge

diff --cc ssl.h
Simple merge

diff --cc syshead.h
Simple merge

diff --cc version.m4
index 0dd97ae7013fb7ba1cbdab24499561e9cb408443,c04c6cf741d57282216b41b5ccb0116e4cd5062e..f390f4c2a548cdfe74383a46ade58198251b5ce1
--- 1/version.m4
--- 2/version.m4
+++ b/version.m4
@@@ -1,5 -1,5 +1,5 @@@
  dnl define the OpenVPN version
- define(PRODUCT_VERSION,[2.2-beta3])
 -define(PRODUCT_VERSION,[2.1.3b])
++define(PRODUCT_VERSION,[2.2-beta])
  dnl define the TAP version
  define(PRODUCT_TAP_ID,[tap0901])
  define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])