merge of '29817a260e6a9fe06810b70340557576d2be9f57'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 4 Feb 2008 17:14:54 +0000 (17:14 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 4 Feb 2008 17:14:54 +0000 (17:14 +0000)
     and '7a8c7842dfe3f66d78bbcc7b5db97559d02147cd'


Trivial merge