Merge remote branch 'hpa/master' into libupload
authorErwan Velu <erwanaliasr1@gmail.com>
Mon, 11 Apr 2011 17:41:56 +0000 (19:41 +0200)
committerErwan Velu <erwanaliasr1@gmail.com>
Mon, 11 Apr 2011 17:41:56 +0000 (19:41 +0200)

Trivial merge