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)
commit2a534087e4606fbc0648429c3599bffb7e9c010a
tree5c9f56ea09bad8f9513181c677c9ffa7287b125e
parentf7cd14fd30d40ae7e904a533804f43d43dd8f439
parent5cff4fb0a50697a04eaae4e3eceb19913ad92811
Merge ../ghc