Merge branch 'master' into amossys amossys
authorOlivier Tétard <olivier.tetard@miskin.fr>
Sat, 11 Feb 2012 11:45:58 +0000 (12:45 +0100)
committerOlivier Tétard <olivier.tetard@miskin.fr>
Sat, 11 Feb 2012 11:45:58 +0000 (12:45 +0100)

Trivial merge