merge of '0b92f5db2f95d0c6de41c8d1e583c2c82e14b488'
authorMichael-Luke Jones <mlj28@cam.ac.uk>
Fri, 22 Sep 2006 16:28:10 +0000 (16:28 +0000)
committerMichael-Luke Jones <mlj28@cam.ac.uk>
Fri, 22 Sep 2006 16:28:10 +0000 (16:28 +0000)
     and '637a94bb7567a04d1efd6676dc5f5661b57465a3'


Trivial merge