merge of '1dec36a8a477dcc0dd86c269177f241e965a4171'
authorGraeme Gregory <dp@xora.org.uk>
Sun, 7 Jan 2007 21:43:41 +0000 (21:43 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Sun, 7 Jan 2007 21:43:41 +0000 (21:43 +0000)
     and '87665cf124d38b77ac09106e6dc6a238e8000108'


Trivial merge