Merge with CVS version
Settings files