Merge from gcc 4.7 branch to gccgo branch

[Ian Lance Taylor]

I've merged revision 188326 from the gcc 4.7 branch to the gccgo
branch.  I also included the two patches I sent out and have committed
to mainline but have not yet committed to 4.7 branch.

Ian