Attached is the fixed backported to the emacs-24 branch
(bzr 110936) if there's interest.