merge of '0632006dcadf27825774caa5189b1ab23bd8b08e'
authorPhilip Balister <philip@balister.org>
Thu, 23 Aug 2007 14:37:17 +0000 (14:37 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 23 Aug 2007 14:37:17 +0000 (14:37 +0000)
     and '215bca295ed86f179e1bb5082f01a1186b910b0d'


Trivial merge