Merge branch 'master' of /home/git/platal
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 8 Sep 2007 08:40:41 +0000 (10:40 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 8 Sep 2007 08:40:41 +0000 (10:40 +0200)

Trivial merge