[Yt-dev] Merging mercurial back into svn trunk