merge conflicts
One more level down
merge branch.
import the head of gdb in gdb.old in preparation for the new gdb import.