merge of '27a6726f10137aaa1d74bdc2a55d3bfb540b1c20'
authorPhilip Balister <philip@balister.org>
Thu, 26 Jul 2007 16:21:56 +0000 (16:21 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 26 Jul 2007 16:21:56 +0000 (16:21 +0000)
     and 'f4725b5787f2a6aa2da9f0257a6e4ab0128ad9e3'


Trivial merge