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