This is the last merge from google/main into google/gcc-4_6 (rev 175816). After this merge, both google/integration and google/main will resume tracking trunk. From now on, any changes needed from trunk or any other google branch, will need to be backported to google/gcc-4_6.
Merges from gcc-4_6-branch will continue. Diego.