merge of '443963b30a3454b1cbac2e120b194068e2b75487'
authorRod Whitby <rod@whitby.id.au>
Sun, 20 May 2007 21:10:27 +0000 (21:10 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 20 May 2007 21:10:27 +0000 (21:10 +0000)
     and 'f85eaa89c131e8c92b6c5fadc0215e08dd9e2e9e'


Trivial merge