This merge brings in all the patches that I applied earlier to trunk. The only differences between trunk and lto now should be the lto specific bits. Diego.