Merged the ICE branch into the trunk

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@992 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c
index 8a68142..b6fb19e 100644
--- a/pjsip/src/pjsua-lib/pjsua_core.c
+++ b/pjsip/src/pjsua-lib/pjsua_core.c
@@ -870,7 +870,7 @@
 	/*
 	 * STUN is specified, resolve the address with STUN.
 	 */
-	status = pj_stun_get_mapped_addr(&pjsua_var.cp.factory, 1, &sock,
+	status = pjstun_get_mapped_addr(&pjsua_var.cp.factory, 1, &sock,
 				         &stun.stun_srv1, 
 					  stun.stun_port1,
 					 &stun.stun_srv2,