Merge branch 'master' into amossys
authorYour Name <olivier.tetard@amossys.fr>
Mon, 28 Nov 2011 13:56:46 +0000 (14:56 +0100)
committerYour Name <olivier.tetard@amossys.fr>
Mon, 28 Nov 2011 13:56:46 +0000 (14:56 +0100)

Trivial merge