merge of 2cb095a37f96f3f076129401bcf32c8ad04a340f
authorRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 22:48:08 +0000 (22:48 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 22:48:08 +0000 (22:48 +0000)
     and cacb10c10d8fe6a99c34d2be101b81f4cf57ed70


Trivial merge