initial commit from svn rev 148