Merge branch 'master' into bootstrap3

Conflicts:
	debian/changelog

1 files changed, 2 insertions, 2 deletions

diff --git a/Utility/Lsof.hs b/Utility/Lsof.hs
index 63009f723..b0d2bc53c 100644
--- a/Utility/Lsof.hs
+++ b/Utility/Lsof.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-{-# LANGUAGE BangPatterns, CPP #-}
+{-# LANGUAGE CPP #-}
 
 module Utility.Lsof where
 
@@ -110,7 +110,7 @@ parseFormatted s = bundle $ go [] $ lines s
 
 {- Parses lsof's default output format. -}
 parseDefault :: LsofParser
-parseDefault = catMaybes . map parseline . drop 1 . lines
+parseDefault = mapMaybe parseline . drop 1 . lines
   where
 	parseline l = case words l of
 		(command : spid : _user : _fd : _type : _device : _size : _node : rest) ->