From-SVN: r49228
Final changes from devo<->egcs merge. Ugh, a year of configury/Makefile hacking. From-SVN: r23012
From-SVN: r14877