Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
authornavarro <navarro@caraja.(none)>
Mon, 29 Oct 2012 16:15:03 +0000 (17:15 +0100)
committernavarro <navarro@caraja.(none)>
Mon, 29 Oct 2012 16:15:03 +0000 (17:15 +0100)

Trivial merge