Beta 1 ('Vetinari') CVS checkin looks good

I checked a few files this morning and it looks like the merging that went on last night when I checked Beta 1 into CVS worked correctly, that is, the way I expected it to. Sync away.

Posted by John B. Cole 2005-11-22