merge of '925ef46f820e0b0c4654698e3a371bb2c3b5b29d'
authorPhilip Balister <philip@balister.org>
Sun, 23 Sep 2007 20:55:38 +0000 (20:55 +0000)
committerPhilip Balister <philip@balister.org>
Sun, 23 Sep 2007 20:55:38 +0000 (20:55 +0000)
     and 'f7f0fdf64cf2ec9da66c3fbed96fe99609073461'


Trivial merge