merge of '1d278c3b71375a6041cbf9533116bfe704ac580f'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 10 Oct 2007 09:19:50 +0000 (09:19 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 10 Oct 2007 09:19:50 +0000 (09:19 +0000)
     and '8cb6ae30ccad06810ab648cf79c4f241eb0a6d4f'


Trivial merge