resolve conflicts.
Help stupid cvs fixing basic conflicts.
Import of binutils, gas, ld & gprof from Cygnus 960609 tree
Initial GNU binutils 2.6 import