merge of 2a4c7bfbf154708a85c5f3e34620be45b44a137d
authorRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 16:17:09 +0000 (16:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 16:17:09 +0000 (16:17 +0000)
     and 589f31431d854bb1374c7e4b776cb2d547feeb8e


Trivial merge