Cool. Stan, since you seem to be knee deep in this, and most interested in smooth merging at the moment, can you remove these from all files? And check this into CVS.... thanks, benjamin