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