merge of '586ec17f18bdda716ffd9874de3224e053eedf13'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 7 Mar 2008 10:02:19 +0000 (10:02 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 7 Mar 2008 10:02:19 +0000 (10:02 +0000)
     and 'b7110cfd27ca2bf8f5d938f1e4ffcaaa6468ea4d'


Trivial merge