Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2008-06-06 20:26:07 -0700 (Fri, 06 Jun 2008)
Revision: 13008
Log message:

      Automated merge of 12935:13007 from svn://svn.metaprl.org/omake-branches/jumbo/var2 into var3

Changes  Path(relative to omake-branches/jumbo/var3)
Properties .
+1 -1 src/Makefile
+1 -1 src/Makefile.nt
+18 -1 src/builtin/omake_builtin_file.ml
Copied test/object/Test18 (from rev 13007, omake-branches/jumbo/var2/test/object/Test18)