Improvement to the solver heuristics:

* Reduce the size of the state space explored by the brute-force heuristics.
* Minimize the actions perfomed by OPAM to only the one explicitely required by the user.

This should fix #323 (or at least greatly improve similar situations).
Merge branch 'master' of github.com:OCamlPro/opam
Update CHANGES