Resolve merge conflict
Resolve merge conflict

Ignore-this: 78e8626b9072a7fe0811baae1221362c

darcs-hash:20130405082755-c8b6b-a2380b16c04718a1f71aec993e45098434312073

alainfrisch/js_of_ocaml,OCamlPro-Henry/js_of_ocaml,alainfrisch/js_of_ocaml,OCamlPro-Henry/js_of_ocaml,alainfrisch/js_of_ocaml,alainfrisch/js_of_ocaml,OCamlPro-Henry/js_of_ocaml,alainfrisch/js_of_ocaml,OCamlPro-Henry/js_of_ocaml,OCamlPro-Henry/js_of_ocaml