Resolve merge conflict with dynlibPref patch The dynlibPref patch accidentally was only pushed to ghc's branch.
Resolve merge conflict with dynlibPref patch
The dynlibPref patch accidentally was only pushed to ghc's branch.

kosmikus/cabal,headprogrammingczar/cabal,rimmington/cabal,plumlife/cabal,fpco/cabal,valderman/cabal,bennofs/cabal,triplepointfive/cabal,beni55/cabal,eric-stanley/cabal,bennofs/cabal,kolmodin/cabal,plow-technologies/cabal,trskop/cabal,Heather/cabal,enolan/cabal,fpco/cabal,x-y-z/cabal,thoughtpolice/cabal,x-y-z/cabal,Helkafen/cabal,seereason/cabal,headprogrammingczar/cabal,gridaphobe/cabal,valderman/cabal,martinvlk/cabal,alphaHeavy/cabal,gbaz/cabal,randen/cabal,mightybyte/cabal,themoritz/cabal,sopvop/cabal,mightybyte/cabal,ghc-android/cabal,thomie/cabal,mmakowski/cabal,eric-stanley/cabal,seereason/cabal,enolan/cabal,mmakowski/cabal,gridaphobe/cabal,anton-dessiatov/cabal,ian-ross/cabal,fugyk/cabal,kolmodin/cabal,sopvop/cabal,lukexi/cabal,typelead/epm,martinvlk/cabal,Peaker/cabal,themoritz/cabal,triplepointfive/cabal,garetxe/cabal,rimmington/cabal,plumlife/cabal,themoritz/cabal,trskop/cabal,christiaanb/cabal,thomie/cabal,corngood/cabal,mydaum/cabal,christiaanb/cabal,ghc-android/cabal,randen/cabal,plow-technologies/cabal,thoughtpolice/cabal,alphaHeavy/cabal,Helkafen/cabal,lukexi/cabal,garetxe/cabal,mydaum/cabal,beni55/cabal,edsko/cabal,ian-ross/cabal,Peaker/cabal,edsko/cabal,kosmikus/cabal,corngood/cabal,gbaz/cabal,anton-dessiatov/cabal,typelead/epm,sopvop/cabal,Heather/cabal,fugyk/cabal