merge of 0f4c7b9e539d7c0a849ae138f7f34bb62ae3bb24
authorRod Whitby <rod@whitby.id.au>
Sun, 24 Dec 2006 03:16:55 +0000 (03:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 24 Dec 2006 03:16:55 +0000 (03:16 +0000)
     and 49f9287272ddf4c93c47c0d79762d5a118ea468f


Trivial merge