merge of '3c4f69f9ba263ccd43af4bc408f5a6cb8337233a'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 3 Oct 2007 12:43:56 +0000 (12:43 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 3 Oct 2007 12:43:56 +0000 (12:43 +0000)
     and 'a5257d19c1dd5c319436cc57245e4ac23ffcd467'


Trivial merge