Correct conflicting symbol and update to new version of vendor software.

Resynchronize with upstream package maintainer version.

Update to new version of vendor software.

(0) -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 tip

mercurial