this commit back-port  several fixes  relevant to camlp4: please see Changes for more details  

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.01@14253 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02