merge of '1b158f684870f3107f58126d4ca5ced24b2c8927'
authorMichael-Luke Jones <mlj28@cam.ac.uk>
Fri, 22 Sep 2006 07:24:24 +0000 (07:24 +0000)
committerMichael-Luke Jones <mlj28@cam.ac.uk>
Fri, 22 Sep 2006 07:24:24 +0000 (07:24 +0000)
     and '1ef7e13b3e401c51337c45e399b1788d0deb4286'


Trivial merge