merge of '25cf9221b246d0e12058653e95979f1aafb0c667'
authorPhilip Balister <philip@balister.org>
Thu, 19 Oct 2006 11:53:06 +0000 (11:53 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 19 Oct 2006 11:53:06 +0000 (11:53 +0000)
     and 'c0e837e430f4657c8d87ba97e9d15210941eecbf'


Trivial merge