Merge remote branch 'origin/master' into chouffe
authorErwan Velu <erwanaliasr1@gmail.com>
Wed, 26 Jan 2011 22:56:09 +0000 (23:56 +0100)
committerErwan Velu <erwanaliasr1@gmail.com>
Wed, 26 Jan 2011 22:56:09 +0000 (23:56 +0100)

Trivial merge