Merge commit 'prashanthm/master'

Conflicts:
	libs/stdext/Makefile

diff --cc libs/stdext/Makefile
index 95d5b9ace503e23b4d21ae04f3685d25421063c4,9bbe2f377a3f0dc6977810719f14af718359379f..7c51c71bd0f99054d05216c4c4c1ef00957ee7db
--- 1/libs/stdext/Makefile
--- 2/libs/stdext/Makefile
+++ b/libs/stdext/Makefile
@@@ -6,7 -6,7 +6,7 @@@ OCAMLINCLUDE += -I ../uui
  OCAML_TEST_INC = -I $(shell ocamlfind query oUnit)
  OCAML_TEST_LIB = $(shell ocamlfind query oUnit)/oUnit.cmxa
  
- OBJS = filenameext stringext hashtblext listext pervasiveext threadext ring qring trie opt unixext bigbuffer vIO varmap
 -OBJS = filenameext stringext hashtblext listext pervasiveext threadext ring qring trie opt unixext bigbuffer vIO eventloop
++OBJS = filenameext stringext hashtblext listext pervasiveext threadext ring qring trie opt unixext bigbuffer vIO varmap eventloop
  INTF = $(foreach obj, $(OBJS),$(obj).cmi)
  LIBS = stdext.cma stdext.cmxa