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