merge of 1356903a17740b20bb7552b94632d9ed22ce77e6
authorRod Whitby <rod@whitby.id.au>
Sat, 19 Aug 2006 13:16:01 +0000 (13:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 19 Aug 2006 13:16:01 +0000 (13:16 +0000)
     and c9627a53aa797e40423af5bd91194eb719fb8d28


Trivial merge