merge of '096af4db5787781750ffca1b165b4c7e87bc2c94'
authorRod Whitby <rod@whitby.id.au>
Sun, 19 Aug 2007 07:44:18 +0000 (07:44 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 19 Aug 2007 07:44:18 +0000 (07:44 +0000)
     and 'd5497549302f40a104bf1e0bb07bed2326a311cc'


Trivial merge