merge of '19860068438a3f48413a2f40e4032ce5e8c1fe7d'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 12 Dec 2006 12:24:17 +0000 (12:24 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 12 Dec 2006 12:24:17 +0000 (12:24 +0000)
     and 'a5b842809a85562e0154b206660598c3b851094c'


Trivial merge