marge with latest svn repos.