merge of 244049db642924c3d41096bbd3e3cc8a4ee881c1
authorRod Whitby <rod@whitby.id.au>
Mon, 11 Dec 2006 11:17:14 +0000 (11:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 11 Dec 2006 11:17:14 +0000 (11:17 +0000)
     and 479d306477e9e051b487e61bc544f3b84a98f23e


Trivial merge