Merge commit 'origin/master'
authorOlivier Tétard <olivier.tetard@miskin.fr>
Tue, 25 Aug 2009 19:46:50 +0000 (21:46 +0200)
committerOlivier Tétard <olivier.tetard@miskin.fr>
Tue, 25 Aug 2009 19:46:50 +0000 (21:46 +0200)

Trivial merge