Merge branch 'format-memory-rework'
authorKen Hornstein <kenh@pobox.com>
Mon, 19 Nov 2012 20:31:21 +0000 (15:31 -0500)
committerKen Hornstein <kenh@pobox.com>
Mon, 19 Nov 2012 20:31:21 +0000 (15:31 -0500)

Trivial merge