Merging with trunk. Not finished.
Merging extraction/common.ml.
Merging extraction/extract_env.ml.
Merging extraction/extraction.ml.
Merging plugins/extraction/haskell.ml.
Merging plugins/extraction/mlutil.ml
Merging plugins/extraction/modutil.ml
Merging plugins/extraction/ocaml.ml
Merging plugins/extraction/table.ml