I have set up a bzr branch of these changes (see above). I am also attaching another diff with these changes.
I have set up a bzr branch of these changes (see above). I am also attaching another diff with these changes.