merge of '3f9d60e4b6f3812dbe67f45236e4992de069c91c'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 19 Dec 2007 13:50:37 +0000 (13:50 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 19 Dec 2007 13:50:37 +0000 (13:50 +0000)
     and '4d03f56302a38e79c12327695f01f27a836720ec'


Trivial merge