merge of '22e9bcb718159eba1d1e60d8a3fda75fdc17fe31'
authorGraeme Gregory <dp@xora.org.uk>
Sun, 7 Oct 2007 19:46:47 +0000 (19:46 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Sun, 7 Oct 2007 19:46:47 +0000 (19:46 +0000)
     and 'd36c82004ef7eae9956811400405963058155b77'


Trivial merge