Comment 22 for bug 493766

The different appearance of 0017-Further-improve-create_frame_xic-patch.patch is due to the slightly different diff algorithms used by Git and Bazaar (http://bramcohen.livejournal.com/37690.html); the actual code change is identical.

If you want to sponsor a merge instead, the one already generated at https://merges.ubuntu.com/e/emacs24/ has been working for me.