Comment 6 for bug 123904

Here is the new and improved debdiff. I've moved the build dependency to have emacs21 in the primary position, so that it can go through right away without waiting for emacs22 to be approved.