merge of 'b3b16abcf910c9b1e8e145776848c3272f9d2f6b'
authorMichael-Luke Jones <mlj28@cam.ac.uk>
Thu, 28 Sep 2006 11:54:29 +0000 (11:54 +0000)
committerMichael-Luke Jones <mlj28@cam.ac.uk>
Thu, 28 Sep 2006 11:54:29 +0000 (11:54 +0000)
     and 'ba21e3a161774cae87c852e6599fe25b213c438c'


Trivial merge