Merge remote-tracking branch 'hpa/master'
authorErwan Velu <erwanaliasr1@gmail.com>
Wed, 2 Nov 2011 19:15:22 +0000 (20:15 +0100)
committerErwan Velu <erwanaliasr1@gmail.com>
Wed, 2 Nov 2011 19:15:22 +0000 (20:15 +0100)

Trivial merge