Very easy merge -- only had one file that needed attention by a human (transform.c ... tv vs. td naming convention). Joilnen: Sorry I did not have time today to teach you the black art of merging -- let's try again next week. Chris