New rebasing of Hatari based on Mercurial upstream.