Port of lk2-4 branch to HEAD in CVS

[Mark D. Studebaker]

let's do this just after the release.

Philip Pokorny wrote:
> The following patch should migrate the changes from the current lk2-4 
> branch over to the HEAD.
> 
> If you checkout the head, then apply this patch and then checkin the 
> results, it should effect a merge of the lk2-4 branch to the main line.
> 
> You may have to apply the patch using -p2 or -p3 since there are several 
> parent directories in the diff command lines.
> 
> :v)
>