Merge from trunk to gccgo branch

[Ian Lance Taylor via Gcc-patches]

I merged trunk revision 3089f5feef36810c625b5813370a97b4ecc841f8 to
the gccgo branch.

Ian