Merge branch 'crypto-buffers'
authorisaacs <i@izs.me>
Tue, 23 Oct 2012 18:26:06 +0000 (11:26 -0700)
committerisaacs <i@izs.me>
Tue, 23 Oct 2012 18:26:06 +0000 (11:26 -0700)

Trivial merge