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

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

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

diff --cc src/msg/msg_io.c
Simple merge

diff --cc src/simix/smx_user.c
Simple merge