merge of '10d336f749155351a4d975d4ce5b31de4a24f911'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 19 Dec 2007 13:49:55 +0000 (13:49 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 19 Dec 2007 13:49:55 +0000 (13:49 +0000)
     and 'fa81c2e4895bf07fa663deaca7f47ed9b591f7e7'


Trivial merge