merge of '5167dafe589b30b1fd121e9d64ec6695c4be37ab'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 28 Mar 2007 08:29:51 +0000 (08:29 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 28 Mar 2007 08:29:51 +0000 (08:29 +0000)
     and '70ffcc90192c83c34dd8fd3a380a9fbef4337058'


Trivial merge