Merge branch 'master' of ssh://git.onelab.eu/git/monitor
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 6 Jul 2011 13:56:35 +0000 (15:56 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 6 Jul 2011 13:56:35 +0000 (15:56 +0200)

Trivial merge