merge of '18d0e9339b2101cf5fd32a7ea23cfd340d4dd6ad'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 10 May 2007 14:17:23 +0000 (14:17 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 10 May 2007 14:17:23 +0000 (14:17 +0000)
     and '6e3fcd9a7fed08259809b6192f8fe066a9d6abbd'


Trivial merge