merge of '276211ed4b7bdea623bfc78d10218ee0c8faf259'
authorRod Whitby <rod@whitby.id.au>
Tue, 4 Sep 2007 08:22:45 +0000 (08:22 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 4 Sep 2007 08:22:45 +0000 (08:22 +0000)
     and '6e5c49eb75135e003132c12690930ce3bd10298f'


Trivial merge