Code review comment for lp:~adiroiban/launchpad/bug-359180-take-2

After talking with Adi, it's clear that the branch is actually an update to an older branch which was landed on devel and then pulled before 10.01 was released due to issue with the keybindings. However, I'm unable to get a sane diff for the changes since then.

Adi, in order to be able to review this branch I need a sane diff for it. At the moment I can't get one because I get a bunch of conflicts when trying to merge it into devel. Here's how you can produce one for me:

 1. Branch devel.
 2. Merge your original branch into your branch of devel.
 3. Merge this branch and paste the diff into the merge proposal.

That should give us just the changes that you've made since your last branch was approved; I'll be happy to review the new diff.