merge of '376e6271722a4507ea977a475f9ff512db8e21d2'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 18 Dec 2006 12:42:30 +0000 (12:42 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 18 Dec 2006 12:42:30 +0000 (12:42 +0000)
     and 'da6646149e7acfedf7008af8e7c94f36f25654da'


Trivial merge