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

diff --cc .gitignore
Simple merge

diff --cc buildtools/Cmake/DefinePackages.cmake
Simple merge

diff --cc include/simgrid/msg.h
Simple merge

diff --cc include/simgrid/simix.h
Simple merge

diff --cc src/include/surf/surf.h
Simple merge