Updating the kdb branch recipe

1. Tag the mainline.  Tradition is to use a tag like V2418_PA13_KDB
   which means "we last merged the kdb branch from here".

2. Change to the kdb branch:
    cvs up -RPd -ko -rkdb_v21

3. Merge the changes between upstream tags, saving a log file for reference:
    cvs up -RPd -ko -rkdb_v21 -jV2418_PA13_KDB -jV2418_PA24_KDB 2>&1 | tee ~/log

4. Peruse the log file for conflicts, fix them

5. Commit -- may need to fix errors here so save a log
    cvs commit -rkdb_v21 -m 'merged V2418_PA13_KDB-V2418_PA24_KDB into kdb branch' 2>&1 | tee ~/log
	
6. Tag the kdb branch
    cvs tag V2418_PA24_KDB_MERGED