merge of 15617f31c93e5e7e35627af8b363148f69541579
authorRod Whitby <rod@whitby.id.au>
Fri, 25 Aug 2006 10:17:01 +0000 (10:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 25 Aug 2006 10:17:01 +0000 (10:17 +0000)
     and 6651fb704192756bf7c80d213d5cb1e48a1541dd


Trivial merge