Merge remote-tracking branch 'hpa/master'
authorErwan Velu <erwanaliasr1@gmail.com>
Mon, 6 Jun 2011 19:18:46 +0000 (21:18 +0200)
committerErwan Velu <erwanaliasr1@gmail.com>
Mon, 6 Jun 2011 19:18:46 +0000 (21:18 +0200)

Trivial merge