[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (606ec0a)

[Ian Lynagh]

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

On branch  : master

https://github.com/ghc/ghc/commit/606ec0a1749399d9085444362b7203b4e96e0530

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

commit 606ec0a1749399d9085444362b7203b4e96e0530
Merge: c548fec fdc3761
Author: Ian Lynagh <ian at well-typed.com>
Date:   Wed Jul 3 13:59:59 2013 +0100

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

 compiler/hsSyn/Convert.lhs | 3 +++
 mk/build.mk.sample         | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)