merge of '3e7a8ec537cc172a69660a77d1f7fc19beef4c6b'
authorRod Whitby <rod@whitby.id.au>
Mon, 21 May 2007 08:10:32 +0000 (08:10 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 21 May 2007 08:10:32 +0000 (08:10 +0000)
     and 'ce51dc8783e9adee55b781e9cdd39cd5e587383f'


Trivial merge