tree bd419d7f7cdf32d356a22cfb05a90b07b970e6ea
parent c17a570d3bf850047b76ba29d27640e021a19a2c
author jat@google.com <jat@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> 1265144563 +0000
committer jat@google.com <jat@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> 1265144563 +0000

Add missing merge record.


git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/2.0@7520 8db76d5a-ed1c-0410-87a9-c151d255dfc7