Well there you go, I deleted my sandbox and did clean cvs checkout and it seems to have updated correctly. I've put back Paul's patches as he originally intended them to be. Sorry about that. -- Andy McKay