merge of 47b03abd184e464304dbd3338b80423c0cb3f5ba
authorRod Whitby <rod@whitby.id.au>
Tue, 12 Dec 2006 20:47:41 +0000 (20:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 12 Dec 2006 20:47:41 +0000 (20:47 +0000)
     and edf7a545b5da68cadee372db18ccfada92801cfc


Trivial merge