Merge branch 'joeyconfig'

3 files changed, 6 insertions, 3 deletions

diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs
index a177c42f..d16c4855 100644
--- a/src/Propellor/Property/Apt.hs
+++ b/src/Propellor/Property/Apt.hs
@@ -3,10 +3,11 @@
 module Propellor.Property.Apt where
 
 import Data.Maybe
-import Control.Applicative
 import Data.List
 import System.IO
 import Control.Monad
+import Control.Applicative
+import Prelude
 
 import Propellor.Base
 import qualified Propellor.Property.File as File
diff --git a/src/Propellor/Property/Chroot/Util.hs b/src/Propellor/Property/Chroot/Util.hs
index 3ebda28f..ff227f52 100644
--- a/src/Propellor/Property/Chroot/Util.hs
+++ b/src/Propellor/Property/Chroot/Util.hs
@@ -6,8 +6,9 @@ import Utility.Exception
 import Utility.Env
 import Utility.Directory
 
-import Control.Applicative
 import System.Directory
+import Control.Applicative
+import Prelude
 
 -- | When chrooting, it's useful to ensure that PATH has all the standard
 -- directories in it. This adds those directories to whatever PATH is
diff --git a/src/Propellor/Property/Cmd.hs b/src/Propellor/Property/Cmd.hs
index 83414dcb..6da2e643 100644
--- a/src/Propellor/Property/Cmd.hs
+++ b/src/Propellor/Property/Cmd.hs
@@ -44,9 +44,10 @@ module Propellor.Property.Cmd (
 	waitForProcess,
 ) where
 
-import Control.Applicative
 import Data.List
 import "mtl" Control.Monad.Reader
+import Control.Applicative
+import Prelude
 
 import Propellor.Types
 import Propellor.Property