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