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