2011-11-21 14:46:12+00:00 Mega-merge seems to have worked, after very little fiddling. I am extremely wary.