Merge commit 'origin/master'
authorOlivier Tétard <olivier.tetard@miskin.fr>
Sat, 12 Sep 2009 17:30:13 +0000 (19:30 +0200)
committerOlivier Tétard <olivier.tetard@miskin.fr>
Sat, 12 Sep 2009 17:30:13 +0000 (19:30 +0200)

Trivial merge