1. 7af4250 Merge r6786 and r6863 from releases/2.0 into this branch, which were adding by jat@google.com ยท 15 years ago