merge of '11eafc7dd646f2c76d8c21ce224e521730ac6a91'
authorMichael-Luke Jones <mlj28@cam.ac.uk>
Thu, 28 Sep 2006 18:17:29 +0000 (18:17 +0000)
committerMichael-Luke Jones <mlj28@cam.ac.uk>
Thu, 28 Sep 2006 18:17:29 +0000 (18:17 +0000)
     and 'dabb67bf3eb39cc2ba26d3beb69b313a14f1da7b'


Trivial merge