merge of '140d4e8beefc04aa7b8e589525cf19f1319cd628'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 16 Oct 2007 21:01:23 +0000 (21:01 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 16 Oct 2007 21:01:23 +0000 (21:01 +0000)
     and '282e9d1e04390c1fd8b629084100fdbb66ba6a5a'


Trivial merge