merge of '68aa05a27b74404294762466c39e227edc79211e'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 3 Dec 2007 12:39:13 +0000 (12:39 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 3 Dec 2007 12:39:13 +0000 (12:39 +0000)
commit302ee217704be5c57b4af6da80cff269916409e6
treecce507ed293edbe4950bb64da68c005633b8c2a2
parent4b81a6a834ee03f8fd0dda8cab8370c20ca1e171
parent3d16b4711f990560a302713ca5f9021f6f79a716
Merge ... '68aa05a27b74404294762466c39e227edc79211e'
     and 'e604e228e5352abcedfc1416e27044c35e049d64'