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/pjlib-util/build/Makefile b/pjlib-util/build/Makefile
index 7973ead..f097310 100644
--- a/pjlib-util/build/Makefile
+++ b/pjlib-util/build/Makefile
@@ -27,7 +27,7 @@
 export PJLIB_UTIL_SRCDIR = ../src/pjlib-util
 export PJLIB_UTIL_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
 		errno.o dns.o dns_dump.o getopt.o md5.o resolver.o \
-		scanner.o stun.o string.o stun_client.o xml.o
+		scanner.o string.o stun_simple.o stun_simple_client.o xml.o
 export PJLIB_UTIL_CFLAGS += $(_CFLAGS)
 
 ###############################################################################