Merge ../ghc
authorRoman Leshchinskiy <rl@cse.unsw.edu.au>
Mon, 8 Oct 2012 22:37:14 +0000 (23:37 +0100)
committerRoman Leshchinskiy <rl@cse.unsw.edu.au>
Mon, 8 Oct 2012 22:37:14 +0000 (23:37 +0100)

Trivial merge