merge of 7f3e4e4b673d55d27ea70c09699c29ae8871a6f5
authorRod Whitby <rod@whitby.id.au>
Thu, 28 Dec 2006 03:05:16 +0000 (03:05 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 28 Dec 2006 03:05:16 +0000 (03:05 +0000)
     and fa035be1706e862ac68978c56244a9f0ffb0f1b8


Trivial merge