[GHC] #10395: ghc-7.10 branch : Please cherry-pick 1a4374c1e2 from master

[GHC]

#10395: ghc-7.10 branch : Please cherry-pick 1a4374c1e2 from master
-------------------------------------+-------------------------------------
        Reporter:  erikd             |                   Owner:
            Type:  bug               |                  Status:  closed
        Priority:  normal            |               Milestone:  7.10.2
       Component:  Compiler          |                 Version:  7.10.1
      Resolution:  fixed             |                Keywords:
Operating System:  Unknown/Multiple  |            Architecture:
 Type of failure:  Building GHC      |  Unknown/Multiple
  failed                             |               Test Case:
      Blocked By:                    |                Blocking:
 Related Tickets:                    |  Differential Revisions:
-------------------------------------+-------------------------------------
Changes (by thoughtpolice):

 * status:  merge => closed
 * resolution:   => fixed


Comment:

 Merged to `ghc-7.10`.

--
Ticket URL: <http://ghc.haskell.org/trac/ghc/ticket/10395#comment:2>
GHC <http://www.haskell.org/ghc/>
The Glasgow Haskell Compiler