merge of 'ed8cc53f61ab5684eccfe6a4732071def8a37424'
authorPhilip Balister <philip@balister.org>
Mon, 26 Nov 2007 21:14:27 +0000 (21:14 +0000)
committerPhilip Balister <philip@balister.org>
Mon, 26 Nov 2007 21:14:27 +0000 (21:14 +0000)
     and 'fd549036e39255b6f9ea199f6ca4fa98085c419d'


Trivial merge