See attached build log.
(Please do not complain about the need for looking at the build log until you can provide an easy way to open bugs with the correct data picked out of a tinderbox log. Thanks.)
Created attachment 247859 [details]
Fixed without revbump.
*** Bug 349469 has been marked as a duplicate of this bug. ***
Looks like the previous fix didn't catch everything. Should be O.K. now.
Patch sent upstream.