I found a typo in that patch and installed the attached further minor 
patch to fix it, as trunk bzr 118017.