Merge remote-tracking branch 'hpa/master'
authorErwan Velu <erwanaliasr1@gmail.com>
Sat, 17 Dec 2011 15:23:37 +0000 (16:23 +0100)
committerErwan Velu <erwanaliasr1@gmail.com>
Sat, 17 Dec 2011 15:23:37 +0000 (16:23 +0100)

Trivial merge