merge of '0c9e50018774b72d8f37660e72fcf552899350bf'
authorPhilip Balister <philip@balister.org>
Fri, 23 May 2008 18:15:49 +0000 (18:15 +0000)
committerPhilip Balister <philip@balister.org>
Fri, 23 May 2008 18:15:49 +0000 (18:15 +0000)
     and '1df29e1460d8a531894547a2df150e7ba591c83d'


Trivial merge