Bug 1006070 - add foo.txt
Merge branch1 into integration-master