merge of '5911b2fa300600b52924de86c4e9bd75e84355e8'
authorRod Whitby <rod@whitby.id.au>
Mon, 10 Sep 2007 04:47:23 +0000 (04:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 10 Sep 2007 04:47:23 +0000 (04:47 +0000)
     and '71355ad1becd174fa435c7a32b1044e782290b57'


Trivial merge