merge of '0ee0a20f5d8af386a339a53032acfcaf526b83c1'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 5 Mar 2008 16:51:30 +0000 (16:51 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 5 Mar 2008 16:51:30 +0000 (16:51 +0000)
     and 'cc22e31466f497241a124a8c98fb74205831a60a'


Trivial merge