Merge remote-tracking branch 'hpa/master'
authorErwan Velu <erwanaliasr1@gmail.com>
Wed, 5 Sep 2012 19:08:39 +0000 (21:08 +0200)
committerErwan Velu <erwanaliasr1@gmail.com>
Wed, 5 Sep 2012 19:08:39 +0000 (21:08 +0200)

Trivial merge