merge of '3fed235384e32b1c9ba26c86ff39b2ffb928fbed'
authorRod Whitby <rod@whitby.id.au>
Tue, 4 Sep 2007 12:28:34 +0000 (12:28 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 4 Sep 2007 12:28:34 +0000 (12:28 +0000)
     and '91c294cf36aad0c7fb931e23dfd4c912b02143f0'


Trivial merge