merge of '9ff0a101d7888656da5ef763d89e174caa81929d'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 25 Oct 2007 09:59:20 +0000 (09:59 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 25 Oct 2007 09:59:20 +0000 (09:59 +0000)
     and 'c03b94ac8fbf026789f1b11941f374e38bc33b98'


Trivial merge