merge of '02f69e2f1f96fe3176524c6d19a802651c0d6d3e'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 6 Feb 2007 12:15:48 +0000 (12:15 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 6 Feb 2007 12:15:48 +0000 (12:15 +0000)
     and '465f7e87f6e551f0e50fb24f3912a466a20587b1'


Trivial merge