merge of '1b21921e11ef943e73ab8419dbb13a2761967b0d'
authorMichael-Luke Jones <mlj28@cam.ac.uk>
Thu, 28 Sep 2006 19:02:45 +0000 (19:02 +0000)
committerMichael-Luke Jones <mlj28@cam.ac.uk>
Thu, 28 Sep 2006 19:02:45 +0000 (19:02 +0000)
     and '313162366ea5bd1facacf8ae454aef9119a4eae0'


Trivial merge