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