merge of '12eb583922c7b7778b159e3f0c2005fd35eeecf2'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 20 Mar 2008 12:20:01 +0000 (12:20 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 20 Mar 2008 12:20:01 +0000 (12:20 +0000)
     and '546fe3a8a6dffbbc40966ee0e8b1ea0c9ba2e9f2'


Trivial merge