Merge remote branch 'origin/master' into monad-comp
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 28 Apr 2011 10:50:15 +0000 (11:50 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 28 Apr 2011 10:50:15 +0000 (11:50 +0100)
commit5ccf658872ea2304f34eda6b1fb840fc1bfc0ba0
tree47e49e4456b062e140737418c034c2df1464b720
parent478e69b303eb2e653a2ebf5c888b5efdfef1fb9d
parent51bbdda993815fc0c3e55cbfcc60ffd512b9d4bd
Merge remote branch 'origin/master' into monad-comp

Conflicts:
compiler/main/HscMain.lhs
compiler/main/DynFlags.hs
compiler/main/HscMain.lhs
compiler/parser/Lexer.x
compiler/typecheck/TcRnTypes.lhs
docs/users_guide/flags.xml