merge of '8e2516afaaa24a7f517979818ae7304aadb4dbc9'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 4 Mar 2008 15:36:55 +0000 (15:36 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 4 Mar 2008 15:36:55 +0000 (15:36 +0000)
     and 'f8359facab8aa6b2607db3f4f3d254d7082a48c5'


Trivial merge