OPM/opm-core — pull request #26 by atgeirr (2012-09-05 11:40:27+00:00)
Title: Make ert branch up-to-date.

Note that the branch merge has only been compiled without ert, that is,
any code that requires ert is still unchanged, even if it is possible
that it would be affected by the changes that have since been
commited to opm-core.