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