House OKs land/rivers bill preserving 1 million acres – much of it in LA County