Merge commit '996960dea8ae0c2c5668e1051c5a9c5a4fb4d888' into froyo-plus-aosp * commit '996960dea8ae0c2c5668e1051c5a9c5a4fb4d888': remove myname accidentally included in one of the files
Merge commit '996960dea8ae0c2c5668e1051c5a9c5a4fb4d888' into froyo-plus-aosp * commit '996960dea8ae0c2c5668e1051c5a9c5a4fb4d888': remove myname accidentally included in one of the files