merged multi-auth branch back into trunk

testing/tests/ikev2/two-certs/pretest.dat

@@ -1,9 +1,8 @@
 moon::/etc/init.d/iptables start 2> /dev/null
 carol::/etc/init.d/iptables start 2> /dev/null
-dave::/etc/init.d/iptables start 2> /dev/null
 moon::ipsec start
 carol::ipsec start
-dave::ipsec start
 carol::sleep 1
-carol::ipsec up home
-dave::ipsec up home
+carol::ipsec up alice
+carol::ipsec up venus
+carol::sleep 1