Apply r2134 to trunk.

git-svn-id: http://corsix-th.googlecode.com/svn/trunk@2136 c39591fa-788f-11de-a72b-d90af8dea425