merge of '895242856fcf260e6a8c8b8e33b96b1304232974'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 11 Apr 2007 11:46:07 +0000 (11:46 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 11 Apr 2007 11:46:07 +0000 (11:46 +0000)
     and 'fc80304b191fefaa6dd43f9c445a5d8da9ac578e'


Trivial merge