Removed CVS keywords from files, to make merging between branches