Merge remote-tracking branch 'hpa/master'
authorErwan Velu <erwanaliasr1@gmail.com>
Fri, 24 Feb 2012 19:56:32 +0000 (20:56 +0100)
committerErwan Velu <erwanaliasr1@gmail.com>
Fri, 24 Feb 2012 19:56:32 +0000 (20:56 +0100)

Trivial merge