Merge trunk to gccgo branch

[Ian Lance Taylor]

I have once again merged trunk to gccgo branch, this time merging
revision 183892.

Ian