Comment 4 for bug 894036

@Paul: I deleted both branches because I got lot of diff errors. The problem is: which one is the right branch I have to pull from? And most important which one is the branch where I have to push to? Probably I pulled from a branch and I tried pushing on a different one, this gave me lot of diff errors. Please tell me where do i have to pull and push and I'll make the rest :) Thanks!