initial commit of code.google merge