merge of '16141cfb7ddd939f1759a94546b737b35c0ece43'
authorPhilip Balister <philip@balister.org>
Thu, 18 Jan 2007 15:15:25 +0000 (15:15 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 18 Jan 2007 15:15:25 +0000 (15:15 +0000)
     and 'c77de7a09c5852f1bfe63afbd011ef701c76bdf6'


Trivial merge