sync of svn trunk