merged changes from ocaml-camlidl; rel 7