Merge remote branch 'origin/master' into ghc-generics
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 26 May 2011 13:33:00 +0000 (14:33 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 26 May 2011 13:33:00 +0000 (14:33 +0100)
1  2 
compiler/main/DynFlags.hs
docs/users_guide/flags.xml
docs/users_guide/glasgow_exts.xml

Simple merge
Simple merge
Simple merge