create a bugfix branch
Add bug fix to TestDoc.txt
Merge branch 'trunkbugfix'