OPM/opm-core — pull request #45 by atgeirr (2012-10-05 08:22:28+00:00)
Title: Keeping ert branch up-to date

Single conflict in Makefile.am handled.