Merge commit 'origin' into platal-0.9.15
authorRaphael Marichez <x2002marichez@murphy.(none)>
Tue, 16 Oct 2007 13:43:46 +0000 (15:43 +0200)
committerRaphael Marichez <x2002marichez@murphy.(none)>
Tue, 16 Oct 2007 13:43:46 +0000 (15:43 +0200)

Trivial merge