merge of '0b0e5efd590cdcc1847caa5505a008258f7a2e45'
authorMichael-Luke Jones <mlj28@cam.ac.uk>
Wed, 27 Sep 2006 22:32:26 +0000 (22:32 +0000)
committerMichael-Luke Jones <mlj28@cam.ac.uk>
Wed, 27 Sep 2006 22:32:26 +0000 (22:32 +0000)
     and 'b95778d4aa9b6135b43b0d0a7b8b4f0d28d0be95'


Trivial merge