RCS Id Police.

Make this match what I posted on comp.sources.unix as patch 1.
(Functionally the same as yesterday's commit.)

Update to version 2.4

Move this to where the latest consensus indicates it should go.
Also, integrate some fixes from Christos.