merge of '55b6b2c132d8b0a81bcec0deed383a3da45e39e8'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 25 Mar 2008 07:34:23 +0000 (07:34 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 25 Mar 2008 07:34:23 +0000 (07:34 +0000)
     and '67254ac9ecc3abdbf0b718b05d6eaa8d6b4b6e92'


Trivial merge