Apply friehm-pf-counters.patch.
cvs commit