Resolve conflict with 0.4.2 branch
authorRoman Leshchinskiy <rl@cse.unsw.edu.au>
Thu, 3 Dec 2009 15:01:33 +0000 (15:01 +0000)
committerRoman Leshchinskiy <rl@cse.unsw.edu.au>
Thu, 3 Dec 2009 15:01:33 +0000 (15:01 +0000)
commit62154ab40d1f927d15e0ea860a145a7b87f71e78
treeb83311a2fd273d2fb47fb79c124c459942643e31
parentb3c859e2b9f2b289fe0a6c28f2f73b0a9fd8a2d7
Resolve conflict with 0.4.2 branch
vector.cabal