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

[Ian Lynagh]

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

On branch  : master

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

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

commit ca9a431401755f119d97dec59a1fc963a8e9f681
Merge: 12ed5c2 08a3862
Author: Ian Lynagh <ian at well-typed.com>
Date:   Tue Jul 9 11:06:17 2013 +0100

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

 compiler/main/DriverPipeline.hs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)