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