Merge remote-tracking branch 'cron2/feat_ipv6_payload_2.3'

Conflicts:
	options.c
	- version string for IPv6 payload changed

Signed-off-by: David Sommerseth <davids@redhat.com>

diff --cc options.c
index f643acc01cbf514db0f71875426a1f4a5d0f2f18,824492e589f0638045bbc9f507583496e3143640..169a8e8afe1b6aa899e78c15fa86753673c8338b
--- 1/options.c
--- 2/options.c
+++ b/options.c
@@@ -79,14 -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)]"
+   " [IPv6 payload 20110522-1 (2.2.0)]"
    " built on " __DATE__
  ;
  

diff --cc route.c
Simple merge

diff --cc tun.c
Simple merge