Merge remote branch 'hpa/master' into libupload
authorErwan Velu <erwanaliasr1@gmail.com>
Thu, 17 Mar 2011 19:09:10 +0000 (20:09 +0100)
committerErwan Velu <erwanaliasr1@gmail.com>
Thu, 17 Mar 2011 19:09:10 +0000 (20:09 +0100)

Trivial merge