merge of '10a90319e7dcbab1d8c8d9e534ce161d889b7a16'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 6 Apr 2007 15:03:18 +0000 (15:03 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 6 Apr 2007 15:03:18 +0000 (15:03 +0000)
     and '8936e843ac2f12f5699d90cb2e20ef1c8b4ce48b'


Trivial merge