Copying the recent plupload changes to the rest of the files in the
repot...