Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-08-06 14:41:32 -0700 (Mon, 06 Aug 2007)
Revision: 11854
Log message:

      Added a "simple" merge script that omits
        - rm -rf boot
        - omake check

Changes  Path(relative to omake-branches/jumbo)
Copied merge-branch-simple (from rev 11600, omake-branches/jumbo/merge-branch)
+4 -4 merge-branch-simple (from rev 11600, omake-branches/jumbo/merge-branch)