Merge branch 'master' into amossys
authorOlivier Tétard <olivier.tetard@miskin.fr>
Mon, 19 Dec 2011 13:08:27 +0000 (14:08 +0100)
committerOlivier Tétard <olivier.tetard@miskin.fr>
Mon, 19 Dec 2011 13:08:27 +0000 (14:08 +0100)

Trivial merge