merge of 269ce8805f00cfdd0e600694a7008d5b867bc235
authorRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 19:01:27 +0000 (19:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 19:01:27 +0000 (19:01 +0000)
     and 773964e4eb4c02c58900ef9f4977458f896ebd7c


Trivial merge