Merge branch 'allocation-fixes' into integration
authorChris Mason <chris.mason@oracle.com>
Mon, 16 Jan 2012 20:25:42 +0000 (15:25 -0500)
committerChris Mason <chris.mason@oracle.com>
Mon, 16 Jan 2012 20:25:42 +0000 (15:25 -0500)

Trivial merge