i just had to do an off-line merge, and with cvs being the way it is, could people (andrew?) who have done weekend commits please verify that i haven't over-ridden anything? lukes