[commit: ghc] wip/new-flatten-skolems-Aug14: Merge remote-tracking branch 'origin/master' into wip/new-flatten-skolems-Aug14 (e42db2e)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/new-flatten-skolems-Aug14
Link       : http://ghc.haskell.org/trac/ghc/changeset/e42db2e21f908af0dc7c0cd5f293b445609eaf0f/ghc

>---------------------------------------------------------------

commit e42db2e21f908af0dc7c0cd5f293b445609eaf0f
Merge: ad1ad63 eb35339
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Oct 2 23:10:16 2014 +0100

    Merge remote-tracking branch 'origin/master' into wip/new-flatten-skolems-Aug14



>---------------------------------------------------------------

e42db2e21f908af0dc7c0cd5f293b445609eaf0f
 libraries/base/GHC/Windows.hs | 3 +--
 rts/PrimOps.cmm               | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)