merge of '7ae9cf78cba04ee2ea4f44d82146b9cc9fbbd4b2'
authorGraeme Gregory <dp@xora.org.uk>
Sun, 30 Sep 2007 21:06:08 +0000 (21:06 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Sun, 30 Sep 2007 21:06:08 +0000 (21:06 +0000)
commit296a74672e69f22606e38e6949a5d811f75bada6
treeb00aecd2467bde9118ed3a34166e3bbdebd1a60c
parentef925687529a6aa4357efe277da42041a1a1793d
parente038f25a766aff2840a9ec63ede6b722cdaff865
Merge ... '7ae9cf78cba04ee2ea4f44d82146b9cc9fbbd4b2'
     and 'fa850c805eca306aba96aedcbfface81cfd404d8'