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