Merge branch 'master' of /home/git/platal
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 24 Aug 2007 22:11:11 +0000 (00:11 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 24 Aug 2007 22:11:11 +0000 (00:11 +0200)

Trivial merge