merge of 27ccadac8de1a506e26898f5e97c53a9b9bcb534
authorRod Whitby <rod@whitby.id.au>
Sun, 20 Aug 2006 21:46:29 +0000 (21:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 20 Aug 2006 21:46:29 +0000 (21:46 +0000)
     and 4f1b5f1876e0bbd495ee093807430903eb190558


Trivial merge