From: Russ Cox <rsc@golang.org>
Date: Tue, 29 May 2012 18:37:41 +0000 (-0400)
Subject: merge unexpected branch
X-Git-Tag: go1.1rc2~3081
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c1b53d43e8c843717b8f6e18897d5fe8e7290a9d;p=gostls13.git

merge unexpected branch
---

c1b53d43e8c843717b8f6e18897d5fe8e7290a9d