Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Thu, 31 Jan 2013 00:28:02 +0000 (00:28 +0000)
committerIan Lynagh <ian@well-typed.com>
Thu, 31 Jan 2013 00:28:02 +0000 (00:28 +0000)
1  2 
compiler/simplCore/SimplCore.lhs

Simple merge