Merge branch 'char-buffers'
authorRobert Bradshaw <robertwb@math.washington.edu>
Tue, 14 Aug 2012 19:29:29 +0000 (12:29 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Tue, 14 Aug 2012 19:29:29 +0000 (12:29 -0700)

Trivial merge