merge of '20d0fba0036cb5884005ec525ad0313ac816ab40'
authorGraeme Gregory <dp@xora.org.uk>
Sun, 7 Oct 2007 09:53:09 +0000 (09:53 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Sun, 7 Oct 2007 09:53:09 +0000 (09:53 +0000)
     and '42116cabf57a560c5f62c543e5cfde0687c99243'


Trivial merge