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

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8a50206c51a534bc00a7a008c08b6adb3f76aa76

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

commit 8a50206c51a534bc00a7a008c08b6adb3f76aa76
Merge: eabd61a 1c03cdf
Author: Ian Lynagh <ian at well-typed.com>
Date:   Tue Mar 12 00:41:41 2013 +0000

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

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