Merge branch 'master' of git.onelab.eu:/git/plewww
authorPanos <antoniad@akastos.local>
Thu, 14 Oct 2010 23:33:06 +0000 (01:33 +0200)
committerPanos <antoniad@akastos.local>
Thu, 14 Oct 2010 23:33:06 +0000 (01:33 +0200)

Trivial merge