merge of '40086c5da432566b67050aa98a809bd2a6dfa5ee'
authorMichael-Luke Jones <mlj28@cam.ac.uk>
Thu, 28 Sep 2006 15:42:38 +0000 (15:42 +0000)
committerMichael-Luke Jones <mlj28@cam.ac.uk>
Thu, 28 Sep 2006 15:42:38 +0000 (15:42 +0000)
     and 'fdaad16592058e7e3020ce9a75962b0be856a2f6'


Trivial merge