Port of lk2-4 branch to HEAD in CVS

[ppokorny at penguincomputing.com (Philip Pokorny)]

Yes.

Jean Delvare wrote:

>>I'll regenerate the patch when you've cut the release.  It's easy.
>>
> 
> It's just checking out HEAD and LK2-4 in different local directories and
> running diff -ruN on them, that's it?
> 
>