[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc (717d4a2)

[Simon Peyton Jones]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

https://github.com/ghc/ghc/commit/717d4a2d5728a58c790457d71b53ca1cd57c086b

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

commit 717d4a2d5728a58c790457d71b53ca1cd57c086b
Merge: 46e204f b5ac19a
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Apr 16 16:41:08 2013 +0100

    Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc

 compiler/main/DynFlags.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)