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

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

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

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

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

diff --cc src/simix/smx_smurf_private.h
Simple merge

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

diff --cc src/surf/storage.c
Simple merge