merge of '1c3d9b4f57e46b646e76da9bd9912c26fb17491c'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 11 Jan 2008 13:35:31 +0000 (13:35 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 11 Jan 2008 13:35:31 +0000 (13:35 +0000)
     and 'cd99d111a7ff26d5c2ce70771e828004ce3e1f09'


Trivial merge