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