merge of '5a50d1d54a36230e32c94701cae6d541b1ff2707'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 15 Nov 2007 14:18:42 +0000 (14:18 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 15 Nov 2007 14:18:42 +0000 (14:18 +0000)
     and '901d93e149a63cd1f5f76b365dfce833a71af87a'


Trivial merge