merge of '116ba428c87f76e784d66658ec09b431f15889fa'
authorMichael-Luke Jones <mlj28@cam.ac.uk>
Wed, 27 Sep 2006 22:36:33 +0000 (22:36 +0000)
committerMichael-Luke Jones <mlj28@cam.ac.uk>
Wed, 27 Sep 2006 22:36:33 +0000 (22:36 +0000)
     and 'dc9bff2d5c5c9d15c295634de30938d7d01c4a34'


Trivial merge