merge of '251ce0b2ecef56298add803931ece23020b55b51'
authorPhilip Balister <philip@balister.org>
Fri, 17 Aug 2007 14:15:36 +0000 (14:15 +0000)
committerPhilip Balister <philip@balister.org>
Fri, 17 Aug 2007 14:15:36 +0000 (14:15 +0000)
     and '56cb1415ef08dcd2f7d216443fc4cff7c06548fa'


Trivial merge