There was a typo in Chong Yidong's fix (installed 2012-08-17) and I installed 
the attached patch to fix it, as master commit 
ef5a526f1b51b76b0f753e0936c80743a7f4463d.