merge of 08158e66a13b9f88a9a08e7326a67afcbd847d7c
authorRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 01:02:01 +0000 (01:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 01:02:01 +0000 (01:02 +0000)
     and a6a7567999a923a8c91f1ad6b0a4b5bc6751dec0


Trivial merge