Merge remote-tracking branch 'hpa/master'
authorErwan Velu <erwanaliasr1@gmail.com>
Wed, 13 Jun 2012 19:25:55 +0000 (21:25 +0200)
committerErwan Velu <erwanaliasr1@gmail.com>
Wed, 13 Jun 2012 19:25:55 +0000 (21:25 +0200)

Trivial merge