Comment 7 for bug 1124130

That would be the best, thanks! Of course, if it turns out that backporting current fixes immediately is double work on which the official branches catch up quickly we will adapt the process. Conflicts should not occur because the change is represented by the same bzr revision id in all branches (using the clone script), although bzr seems to be pretty robust against identical code changes merged multiple times in distinct revisions too. Just don't add any extra spaces while merging ;-)