Merge branch 'feat_ipv6_payload'

Conflicts:
	options.c
	- feat_ipv6_payload and feat_ip6_transport both updates
      this file with presence information

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

diff --cc init.c
Simple merge

diff --cc mroute.c
Simple merge

diff --cc multi.c
Simple merge

diff --cc openvpn.8
Simple merge

diff --cc options.c
index 4e87a97dc55841da4b8050e8ed10302472e07316,6f98d140a14a4558f34e2775bada6ff8119bfb81..8d1645d7755e19154f836f0d0c6c61d0fb35dbde
--- 1/options.c
--- 2/options.c
+++ b/options.c
@@@ -79,13 -79,8 +79,14 @@@ const char title_string[] 
  #endif
  #ifdef ENABLE_EUREPHIA
    " [eurephia]"
 +#endif
 +#if ENABLE_IP_PKTINFO
 +  " [MH]"
 +#endif
 +#ifdef USE_PF_INET6
 +  " [PF_INET6]"
  #endif
+   " [IPv6 payload 20110424-2 (2.2RC2)]"
    " built on " __DATE__
  ;
  

diff --cc route.c
Simple merge

diff --cc socket.c
Simple merge

diff --cc socket.h
Simple merge

diff --cc tun.c
Simple merge

diff --cc win32.h
Simple merge