Another merge from gcc 4.7 branch to gccgo branch

[Ian Lance Taylor]

I merged revision 190574 from the gcc 4.7 branch to the gccgo branch.

Ian