Comment 10 for bug 1171434

Quick test of 1171434.v3.patch with r12319 looks ok on OS X 10.7.5 (I haven't yet checked for possible regressions wrt to bug #1102069).

This issue needs to be backported to the stable release branch because the change which introduced it was also committed to 0.48.x in revision 9948.