merge of 2e42416bfdbbc17b0d6d5cd751bb0b542115fc51
authorRod Whitby <rod@whitby.id.au>
Sun, 27 Aug 2006 13:01:27 +0000 (13:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 27 Aug 2006 13:01:27 +0000 (13:01 +0000)
     and 637ca3e6b5d8f03ecbcd50fbb9bcf85ca0a208ab


Trivial merge