merge autobuild sources with SVN