merge of '6047723508e3b6eeb7bb92d452b11b5e946540bf'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 12 Mar 2008 22:29:15 +0000 (22:29 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 12 Mar 2008 22:29:15 +0000 (22:29 +0000)
     and 'd30c6b8bd3c20b5346a9fd726b241df1917bf08e'


Trivial merge