merge of '4782f0e3205e9a58989aa7961f0817534da68bf5'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 27 Nov 2006 10:48:01 +0000 (10:48 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 27 Nov 2006 10:48:01 +0000 (10:48 +0000)
     and '7a3a6ca004f6829b6529cad137491c285d91aa4b'


Trivial merge