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