Bug 1006090 - update foo.txt
Merge branch1 into integration-master