Merge branch 'master' into amossys
authorOlivier Tétard <olivier.tetard@amossys.fr>
Tue, 20 Dec 2011 17:46:39 +0000 (18:46 +0100)
committerOlivier Tétard <olivier.tetard@amossys.fr>
Tue, 20 Dec 2011 17:46:39 +0000 (18:46 +0100)

Trivial merge