Merge branch 'roland/x86-tcb-align'
authorRoland McGrath <roland@hack.frob.com>
Sat, 20 Aug 2011 17:02:54 +0000 (10:02 -0700)
committerRoland McGrath <roland@hack.frob.com>
Sat, 20 Aug 2011 17:02:54 +0000 (10:02 -0700)

Trivial merge