merge of '13c300f63e70c7f9fa8bb5896db6f302da774262'
authorPhilip Balister <philip@balister.org>
Wed, 28 Feb 2007 13:25:20 +0000 (13:25 +0000)
committerPhilip Balister <philip@balister.org>
Wed, 28 Feb 2007 13:25:20 +0000 (13:25 +0000)
     and '7f4176e237bc030ef99353d2126c7cefa3375068'


Trivial merge