merge of 'acf4b7a604a664fd099f500a1314ae67093f431d'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 3 Apr 2007 11:26:00 +0000 (11:26 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 3 Apr 2007 11:26:00 +0000 (11:26 +0000)
     and 'b5facee80862bc1e72163e99edaccd567d9621ed'


Trivial merge