Merge remote-tracking branch 'hpa/master'
authorErwan Velu <erwanaliasr1@gmail.com>
Fri, 25 May 2012 21:08:35 +0000 (23:08 +0200)
committerErwan Velu <erwanaliasr1@gmail.com>
Fri, 25 May 2012 21:08:35 +0000 (23:08 +0200)

Trivial merge