merge of '089057d0f120a7856abf8245745dc0cddf2018de'
authorRod Whitby <rod@whitby.id.au>
Tue, 25 Mar 2008 03:16:02 +0000 (03:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 25 Mar 2008 03:16:02 +0000 (03:16 +0000)
     and 'bfbb7a4b91b1cef9bf586944b836302144e3c8b0'


Trivial merge