merge of '9a8033e81f2f82d4e63c6bbb8247dec9e225a26b'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 4 Mar 2008 15:37:05 +0000 (15:37 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 4 Mar 2008 15:37:05 +0000 (15:37 +0000)
     and 'd1c77dbbaa65c8a85e23e784e8a31dc0878ab252'


Trivial merge