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)>
Tue, 23 Oct 2012 19:16:04 +0000 (21:16 +0200)
committernavarro <navarro@caraja.(none)>
Tue, 23 Oct 2012 19:16:04 +0000 (21:16 +0200)

Trivial merge