merge of ee3f1c72b90cdde740b9ed59f9e5efe93fe0448f
authorRod Whitby <rod@whitby.id.au>
Fri, 8 Dec 2006 09:16:41 +0000 (09:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 8 Dec 2006 09:16:41 +0000 (09:16 +0000)
     and f927bfebd6e84cf9b149eee5e523cc8e63c0dbcd


Trivial merge