Merge branch 'master' of /home/git/platal into fusionax
authorPascal Corpet <pascal.corpet@m4x.org>
Fri, 11 Apr 2008 21:47:15 +0000 (23:47 +0200)
committerPascal Corpet <pascal.corpet@m4x.org>
Fri, 11 Apr 2008 21:47:15 +0000 (23:47 +0200)

Trivial merge