Merge branch 'master' of git.onelab.eu:/git/plewww
authorPanos <antoniad@akastos.rsr.lip6.fr>
Fri, 15 Oct 2010 12:51:58 +0000 (14:51 +0200)
committerPanos <antoniad@akastos.rsr.lip6.fr>
Fri, 15 Oct 2010 12:51:58 +0000 (14:51 +0200)

Trivial merge