topologies should be considered equal ignoring the last bit

[[Imported from SVN: r6284]]

dune/common/geometrytype.hh

@@ -289,9 +289,7 @@ namespace Dune {
       return ( ( none_ == other.none_ )
                && ( ( none_ == true )
                     || ( ( dim_ == other.dim_ )
-                         && ( ( dim_ < 2 )
-                              || ( topologyId_ == other.topologyId_ )
-                              )
+                         && ( (topologyId_ >> 1) == (other.topologyId_ >> 1) )
                          )
                     )
                );
@@ -307,8 +305,8 @@ namespace Dune {
       return ( ( none_ < other.none_ )
                || ( !( other.none_ < none_ )
                     && ( ( dim_ < other.dim_ )
-                         || ( !( other.dim_ < dim_ )
-                              && ( topologyId_ < other.topologyId_ )
+                         || ( (other.dim_ == dim_)
+                              && ((topologyId_ >> 1) < (other.topologyId_ >> 1) )
                               )
                          )
                     )