Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --combined doc/doxygen/module-surf.doc
index 77e2606,89b146a..36f6899
--- 1/doc/doxygen/module-surf.doc
--- 2/doc/doxygen/module-surf.doc
+++ b/doc/doxygen/module-surf.doc
@@@ -7,7 -7,7 +7,7 @@@
     - \ref SURF_resources
     - \ref SURF_build_api
     - \ref SURF_interface
-    - \ref SURF_routing
+    - \ref SURF_routing_interface
     - \ref SURF_cpu_interface
     - \ref SURF_network_interface
     - \ref SURF_storage_interface
@@@ -159,14 -159,6 +159,14 @@@
  @htmlonly <!-- DOXYGEN_NAVBAR_LABEL="VM Workstation Interface" --> @endhtmlonly
  */
  
 +/**
 +@defgroup SURF_lmm   SURF Linear MaxMin
 +@ingroup SURF_API
 +@brief Describes how the linear MaxMin system work
 +
 +@htmlonly <!-- DOXYGEN_NAVBAR_LABEL="SURF Linear MaxMin" --> @endhtmlonly
 +*/
 +
  /**
  @defgroup SURF_callbacks   SURF callbacks
  @ingroup SURF_API