[commit: ghc] master, newcg: Merge remote-tracking branch 'origin/master' into newcg (314ea4f)

[Simon Marlow]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branches: master,newcg

http://hackage.haskell.org/trac/ghc/changeset/314ea4ffff1aef6f6dac7a6f7d3d293122508bf0

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

commit 314ea4ffff1aef6f6dac7a6f7d3d293122508bf0
Merge: bfbdbcb... ad16de2...
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Thu Jul 5 13:38:32 2012 +0100

    Merge remote-tracking branch 'origin/master' into newcg
    
    * origin/master:
      prefer later defined commands (fixes #3858)

 ghc/InteractiveUI.hs |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)