merge of '0e7cf314445d29e0276495334a084542f8d43c44'
authorMichael-Luke Jones <mlj28@cam.ac.uk>
Sun, 17 Dec 2006 15:16:17 +0000 (15:16 +0000)
committerMichael-Luke Jones <mlj28@cam.ac.uk>
Sun, 17 Dec 2006 15:16:17 +0000 (15:16 +0000)
     and '3640a9bf0088e4fec83fb7c5264e759a5cd6291d'


Trivial merge