Add conflict between typerex 1.99.0-beta and ocp-build 0.1
add a debugging package to replace camlp4 with logging equivalents
Merge branch 'master' of git://github.com/OCamlPro/opam-repository