Ensembles/ert — pull request #127 by joakim-hove (2013-07-24 12:24:54+00:00)
Title: Reapply MSW to upstream/master

This PR should be held until the PR: https://github.com/Ensembles/ert/pull/120 has been merged.