Merge branch 'ghc-7.8'

Re-unite branches which diverged for now good reason

Conflicts:
	changelog.md

2 files changed, 9 insertions, 3 deletions

diff --git a/changelog.md b/changelog.md
index 54e5a96..9d587ab 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,12 @@
-## 2.7.0.1
+## 2.7.0.1  *Mar 2014*
 
-  * Handle EROFS and ETXTBSY as (non-exceptional) permission denied in `fileAccess`
+  * Bundled with GHC 7.8.1
+
+  * Handle `EROFS` and `ETXTBSY` as (non-exceptional) permission denied in
+    `fileAccess`
+
+  * Fix `getFileStatus` to retry `stat(2)` when it returns `EAGAIN`
+    (this can happen on Solaris)
 
 ## 2.7.0.0  *Nov 2013*
 
diff --git a/unix.cabal b/unix.cabal
index 03d47b4..12f463b 100644
--- a/unix.cabal
+++ b/unix.cabal
@@ -43,7 +43,7 @@ source-repository head
 source-repository this
     type:     git
     location: http://git.haskell.org/packages/unix.git
-    tag:      unix-2.7.0.0-release
+    tag:      unix-2.7.0.1-release
 
 library
     default-language: Haskell2010