Replaced the 4.0 branch by a copy of the trunk (in order to keep the history of the latest changes of the trunk); this replacement is due to a limitation of Subversion where a merge is regarded as a single commit, and is OK here since the 4.0 branch is new. [[Split portion of a mixed commit.]] [From SVN r12024]