merge of '30d98b4425ef003cbb8d55331331b30fb4e01742'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 19 Feb 2008 11:42:29 +0000 (11:42 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 19 Feb 2008 11:42:29 +0000 (11:42 +0000)
     and '69dabfbe1413fb2b5406fa5303f924d26af15b02'


Trivial merge