svn merge; SConstruct changes