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

diff --combined tools/cmake/DefinePackages.cmake
index 9fcf222,a3af7a0..31d4066
--- 1/tools/cmake/DefinePackages.cmake
--- 2/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -352,6 -352,7 +352,6 @@@ set(SIMIX_SR
    src/simix/libsmx.c
    src/simix/smx_context.c
    src/simix/smx_context_base.c
 -  src/simix/smx_context_raw.c
    src/simix/smx_deployment.c
    src/simix/smx_environment.c
    src/simix/smx_global.c
@@@ -366,18 -367,6 +366,18 @@@
    ${SIMIX_GENERATED_SRC}
    )
  
 +# Don't try to compile our inline assembly with MSVC
 +if (MSVC)
 +  set(EXTRA_DIST
 +      ${EXTRA_DIST}
 +      src/simix/smx_context_raw.c)
 +else()
 +  set(SIMIX_SRC
 +      ${SIMIX_SRC}
 +      src/simix/smx_context_raw.c)
 +endif()
 +
 +# Boost context may not be available
  if (HAVE_BOOST_CONTEXT)
    set(SIMIX_SRC
        ${SIMIX_SRC}
@@@ -901,7 -890,7 +901,7 @@@ set(DOC_SOURCE
    doc/doxygen/pls.doc
    doc/doxygen/stylesheet.css
    doc/doxygen/tracing.doc
-   doc/doxygen/use.doc
+   doc/doxygen/examples.doc
  
    doc/manpage/smpicc.1
    doc/manpage/smpicxx.1
@@@ -952,6 -941,7 +952,7 @@@ set(DOC_IM
    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/awstats_logo3.png
    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/output.goal.pdf
    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png
+   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/storage_sample_scenario.png
    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.gif
    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png