Merge pull request #1203 from Chris00/master

Add cairo 0.4.6
Add oasis2opam 0.3.6