Merge https://github.com/haskell/unix
authorHerbert Valerio Riedel <hvr@gnu.org>
Thu, 26 Jun 2014 22:05:14 +0000 (00:05 +0200)
committerHerbert Valerio Riedel <hvr@gnu.org>
Thu, 26 Jun 2014 22:05:14 +0000 (00:05 +0200)

Trivial merge