Merge remote branch 'hpa/master' into libupload
authorErwan Velu <erwanaliasr1@gmail.com>
Fri, 18 Mar 2011 08:33:05 +0000 (09:33 +0100)
committerErwan Velu <erwanaliasr1@gmail.com>
Fri, 18 Mar 2011 08:33:05 +0000 (09:33 +0100)

Trivial merge