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