Stripping CVS keywords
Merge branch 'master' into 6.x-1.x
updated readme.txt