Opam files: catch lexing errors too, cleanup error messages
Fix unwanted removing of pinned orphan packages
Make the parser a little less dumb
Add a check for corrupt (empty) locks and throw a better error
Merge pull request #1262 from dsheets/check-corrupt-locks

Add a check for corrupt (empty) locks and throw a better error
Merge pull request #1260 from OCamlPro/parser-rewrite

Improve the OPAM parser
Update CHANGES
Fixed 'opam update' with repo and package with the same name

Closes #1160
Merge pull request #1266 from OCamlPro/upd-repo-pkg

Fixed 'opam update' with repo and package with the same name
Fixed the new grammar
Merge pull request #1268 from OCamlPro/fix-grammar

Fixed conflicts in the new parser grammar
corrected bug so that I can install OASIS 0.4.4 for example,
even if my HOME is on NFS
Merge pull request #1270 from UnixJunkie/dont_preserve_timestamps_because_NFS_doesnt_allow_it

corrected bug so that I can install OASIS 0.4.4 for example,
Revert "Merge pull request #1270 from UnixJunkie/dont_preserve_timestamps_because_NFS_doesnt_allow_it"

This reverts commit 374a5114604208ebea214fbfb0d200222395a765, reversing
changes made to bcfb7e00b88166d8d4f37c96a06f799dc7d0f59e.
Rename no_aspcud to use_internal_solver
Merge pull request #1275 from rdicosmo/add-solver-option

Rename no_aspcud to use_internal_solver