I'm going to start the merge right now ... please stand by. Chris P.S. To Jonathan Merritt: I found a doc that recommends the use of '-kk' when merging (don't substitute keywords): http://www.rons.net.cn/htp/cvs/cvs_5.html#SEC64