merge of '73862e82dbaa87f0d1f27cd2641785c761b41227'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 20 Nov 2007 13:39:10 +0000 (13:39 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 20 Nov 2007 13:39:10 +0000 (13:39 +0000)
commitf0ee787ea08ff7cb7a25b7f693119059370cd2f1
treeb2a4ec7e8e65c75ebef5ecb535768440aa146c4a
parentafe7c1e7628c8a991bfbbb342f9a3b3ddf5ae02d
parent8db9e3a01dce8e7ddf250f7cf9da931ac7649562
Merge ... '73862e82dbaa87f0d1f27cd2641785c761b41227'
     and 'ada36533264ca20fee46b2e51218c9ddf7b71126'