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