Merge branch 'user-defined-allocations'
authorDan White <dan@whiteaudio.com>
Tue, 7 May 2013 18:01:17 +0000 (13:01 -0500)
committerDan White <dan@whiteaudio.com>
Tue, 7 May 2013 18:01:17 +0000 (13:01 -0500)

Trivial merge