Merge branch 'master' of /home/git/platal
authorAymeric Augustin <aymeric.augustin@m4x.org>
Fri, 4 Apr 2008 12:44:44 +0000 (14:44 +0200)
committerAymeric Augustin <aymeric.augustin@m4x.org>
Fri, 4 Apr 2008 12:44:44 +0000 (14:44 +0200)

Trivial merge