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)
     and 'e604e228e5352abcedfc1416e27044c35e049d64'


Trivial merge