1. e7f61a7 Merge from releases/1.6:r4198:4268,4269:4297,4299:4320:4321:4366 into trunk by jat@google.com ยท 16 years ago