Fix conflicts.  This brings rev 1.2 (fix stabs ordering for a.out) into EGCS 1.1.2.
Fix conflicts.  This brings rev 1.2 (fix stabs ordering for a.out) into
EGCS 1.1.2.

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase