merge of 'c4ed79adf85d92bc2034e14769aa214508a7573b'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 28 Mar 2007 08:30:18 +0000 (08:30 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 28 Mar 2007 08:30:18 +0000 (08:30 +0000)
     and 'd20017ea6470fca901c860c5dd99f1a8fc1b6555'


Trivial merge