merge of '18329693bf27e4a4c165e8105cc4ecf9477dd53b'
authorMichael-Luke Jones <mlj28@cam.ac.uk>
Mon, 25 Sep 2006 10:09:04 +0000 (10:09 +0000)
committerMichael-Luke Jones <mlj28@cam.ac.uk>
Mon, 25 Sep 2006 10:09:04 +0000 (10:09 +0000)
     and 'e1007e8f66e600742b6b7b457b3e1fef1cfeb942'


Trivial merge