merge of 469700449a3e130b38c90091651ec45455b58895
authorRod Whitby <rod@whitby.id.au>
Tue, 26 Dec 2006 17:17:18 +0000 (17:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 26 Dec 2006 17:17:18 +0000 (17:17 +0000)
     and bb0b574e4eebfa7477f1807d005a18b71eaacc49


Trivial merge