merge trunk

[[Imported from SVN: r6729]]

dune/common/mpitraits.hh

@@ -145,7 +145,7 @@ namespace Dune
 }
 namespace std
 {
-  template<typename T1,typename T2> class pair;
+  template<typename T1,typename T2> struct pair;
 }
 
 namespace Dune

lib/dunemodules.lib

@@ -69,7 +69,8 @@ parse_control() {
   # - source module: ${path}/dune.module
   #   and there is a file ${path}/${name}.pc.in
   local path="$(canonicalpath "$1")"
-  if test -f $path/../../../lib/dunecontrol/${name}/dune.module; then
+  if test ! -f $path/dune.module -a \
+     -f $path/../../../lib/dunecontrol/${name}/dune.module; then
 	  path=$(canonicalname "$path/../../../")
       export module_inst="yes"
   fi