merge of '1f780d8e2b271c3a78946dd30b72a09f2a0008b9'
authorRod Whitby <rod@whitby.id.au>
Sun, 11 Mar 2007 17:24:31 +0000 (17:24 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 11 Mar 2007 17:24:31 +0000 (17:24 +0000)
     and '9e34f5ae1f2437092c7a4565465bf1a59b730639'


Trivial merge