branches: 1.1.1.2.54; 1.1.1.2.60;
Import once more, this time stripping $'s from RCS Ids, so that they
are kept intact.