Merge pull request #610 from Chris00/master

Updating (again) some packages with oasis2opam
Merge branch 'master' of git://github.com/OCamlPro/opam-repository