merge of '47aec7f5811a7e41e48a85cc8ca83a9ef745e862'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 4 Dec 2007 11:10:51 +0000 (11:10 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 4 Dec 2007 11:10:51 +0000 (11:10 +0000)
     and '5f67fa16e46b84f45483e590d1acf78095ca9c44'


Trivial merge