I asked "is it fixed within the trunk" because I didn't want to make try and error within the branch.
As I didn't got response on this, I integrated all changes into the branch with all possible problems.

So please give me response if it is now fixed with the latest revsion.