merge of '7ab7cd009151ed33e67d7c5eda14b7f7dff8c9a8'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 7 Feb 2008 13:58:35 +0000 (13:58 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 7 Feb 2008 13:58:35 +0000 (13:58 +0000)
     and 'c20a54aa8e31679eab91bd7856ec168bce74a60e'


Trivial merge