merge of '7ae9cf78cba04ee2ea4f44d82146b9cc9fbbd4b2'
authorGraeme Gregory <dp@xora.org.uk>
Sun, 30 Sep 2007 21:06:08 +0000 (21:06 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Sun, 30 Sep 2007 21:06:08 +0000 (21:06 +0000)
     and 'fa850c805eca306aba96aedcbfface81cfd404d8'


Trivial merge