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)
commit75ca14aea7cb692737bf5a51933fbaf56f46fcbc
tree65a6d82843be780c348395a6ac2911bfea604df0
parentca1d32f37e5515d92572ddeb03d594b8cb132060
parentd63abad2c510fb80b1e2dc439f8277bfe39cd5c2
Merge ... '3c4f69f9ba263ccd43af4bc408f5a6cb8337233a'
     and 'a5257d19c1dd5c319436cc57245e4ac23ffcd467'