merge of 'c4435e84c90ba841930a612af7c532b832a0e612'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 18 Apr 2008 19:17:27 +0000 (19:17 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 18 Apr 2008 19:17:27 +0000 (19:17 +0000)
     and 'd80795e44adf312443a758931387dd699d47b8de'


Trivial merge