merge of '25b9e259d256dba0e7e78b122b1880331d820762'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 20 Mar 2008 12:24:54 +0000 (12:24 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 20 Mar 2008 12:24:54 +0000 (12:24 +0000)
     and '776dc04c7eba19512692b4d40a123d45e6adb862'


Trivial merge