Merge branch 'feature-concurrent-evacuation'
authorMark Probst <mark.probst@gmail.com>
Sat, 23 Feb 2013 00:35:00 +0000 (16:35 -0800)
committerMark Probst <mark.probst@gmail.com>
Sat, 23 Feb 2013 00:35:00 +0000 (16:35 -0800)

Trivial merge