Merge ../aio-fixes
authorBenjamin LaHaise <bcrl@kvack.org>
Mon, 14 Jul 2014 17:14:27 +0000 (13:14 -0400)
committerBenjamin LaHaise <bcrl@kvack.org>
Mon, 14 Jul 2014 17:14:27 +0000 (13:14 -0400)

Trivial merge