Merge branch 'master' of git://github.com/OCamlPro/opam
Merge branch 'master' of github.com:avsm/opam