merge of '4ed867356aa513df5383618b7b7dbfe95e1a60f3'
authorMichael-Luke Jones <mlj28@cam.ac.uk>
Sat, 23 Sep 2006 15:44:37 +0000 (15:44 +0000)
committerMichael-Luke Jones <mlj28@cam.ac.uk>
Sat, 23 Sep 2006 15:44:37 +0000 (15:44 +0000)
     and '61fe964a3f1677ae14fdaf18662f4d14b4613bb1'


Trivial merge