Bug 1006063 - add bar.txt
Merge branch2 into integration-master