Merge remote branch 'hpa/master' into libupload
authorErwan Velu <erwanaliasr1@gmail.com>
Wed, 16 Mar 2011 20:27:10 +0000 (21:27 +0100)
committerErwan Velu <erwanaliasr1@gmail.com>
Wed, 16 Mar 2011 20:27:10 +0000 (21:27 +0100)

Trivial merge