Updating to CVS head - had fixes for stage1B index problems