fix up conflicts
Manual merge of ChangeLog entries.A bit icky, but binutils includes contain both libiberty stuff and itsown stuff...
branches: 1.1.1;Initial revision