merge of '967336334b2d3b22623c9851eb0ab8a2f5ad19c2'
authorPhilip Balister <philip@balister.org>
Tue, 12 Feb 2008 13:42:34 +0000 (13:42 +0000)
committerPhilip Balister <philip@balister.org>
Tue, 12 Feb 2008 13:42:34 +0000 (13:42 +0000)
     and 'f1ce41fae2ee4dc6bfc75fb8d991a37869ef24d8'


Trivial merge