cvs issues

Hi,

Small cvs source issues:

1. lserver.lnk contains

<<<<<<< lserver.lnk
#zlib                               # compress module
=======
>>>>>>> 1.29

What the heck is <<<<, ====, and >>>> means ? I wouldn't really mind, but it
breaks linking with the message: <<< was not expected. By commenting this
lines everything goes fine. Do not want to flame anybody, but there is a
constant problem with this module :)) Before it was uncommented zlib. Could
be frustrating for new guys.

2. There is an inconsistency in:

sys/src/Interfaces/CPC/CVS/Repository
sys/src/Interfaces/ODBC/CVS/Repository
sys/src/livecache/lvcBench/CVS/Repository

In all those cases directories CPC, ODBC, lvcBench have different from
"real" directories names. CPC, ODBC, lvcBench are in fact cpc, odbc,
lvcbench on the server (case mix-up). This causes cvs to report that this
directories are no longer in the repository and update them all the time.
Kind of annoying :)

Thanks.
--
Mike