FL:869: integrate anoncvs gentoo updates into regen... first take