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