merge of '0d37beef48144a1e6e6f1e015c51e634852fb3a5'
authorGraeme Gregory <dp@xora.org.uk>
Sat, 7 Jul 2007 12:23:38 +0000 (12:23 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Sat, 7 Jul 2007 12:23:38 +0000 (12:23 +0000)
     and '7ffbdb39a4bb7d635e50844ce0112b7cf860caf9'


Trivial merge