merge of '031a650eb799f1540b4d16dd84e63a11ea58463c'
authorGraeme Gregory <dp@xora.org.uk>
Sun, 7 Jan 2007 22:28:23 +0000 (22:28 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Sun, 7 Jan 2007 22:28:23 +0000 (22:28 +0000)
     and '199b94068183639a7d0f5c71711782b991bb9812'


Trivial merge