merge of '2cc1d45d9437bdd14d505b2d7872c95ac87a0157'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 2 Nov 2007 12:25:27 +0000 (12:25 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 2 Nov 2007 12:25:27 +0000 (12:25 +0000)
     and 'ae7352b220b0e0099308d35ee2853b9ba371ca64'


Trivial merge