merge of '152391f4367c4184f3b73eb8fa296c0a57a369b5'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 12 Oct 2007 09:47:15 +0000 (09:47 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 12 Oct 2007 09:47:15 +0000 (09:47 +0000)
     and '2d894aa798e84e7893b67bcfe840faae8e260df1'


Trivial merge