merge of '132c1b3c5921e1354513f1817b3fc526e0c3d674'
authorMichael-Luke Jones <mlj28@cam.ac.uk>
Thu, 28 Sep 2006 14:37:42 +0000 (14:37 +0000)
committerMichael-Luke Jones <mlj28@cam.ac.uk>
Thu, 28 Sep 2006 14:37:42 +0000 (14:37 +0000)
     and '8dcac6d1b8811f90c2e9d9ec5bb911e3fc8d9259'


Trivial merge