Make number of smoothing steps and scaling factor for prolongation of AMG adjustable
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/OPM/opm-core
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branches 'origin/master' and 'upstream/master'
Finished customizability in terms of steps and prolongateFactor
remove the include statement for omp.h in geometry.c

this fixes the build on clang
make config.h the first header to be included in any compile unit

this is required for consistency amongst the compile units which are
linked into the same library and seems to be forgotten quite
frequently.
Merge pull request #230 from andlaus/fix_build

opm.h -> config.h
final packaging for 2013.03
Fix a few doxygen issues with the tutorials
Merge pull request #231 from andlaus/fix_doxygen

Fix a few doxygen issues with the tutorials
Quote possibly empty variable to avoid error message

On RedHat 6.4 workstation the module doesn't find the necessary system
information, and gives an error message when the last parameter to the
string function is not present.
Read /etc/system-release if others not parseable
Corrected mismatched if-else-endif arguments
Merge pull-request #232 from rolk/232_distrib
Merge pull-request #232 from rolk/232_distrib