[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (a7b08c0)

[Ian Lynagh]

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

On branch  : master

https://github.com/ghc/ghc/commit/a7b08c05a883c350d017ebc9de5bb70b818bcb6a

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

commit a7b08c05a883c350d017ebc9de5bb70b818bcb6a
Merge: 444119f d9b57e7
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Apr 7 13:18:00 2013 +0100

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

 compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs | 2 +-
 ghc.mk                                              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)