Merge "remove myname accidentally included in one of the files" into froyo