merge of 1897dabec68161c37cd3543ac7f113e99557ec54
authorRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 17:02:12 +0000 (17:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 17:02:12 +0000 (17:02 +0000)
     and 708c7f78bd38429a1db285a3e8f82d315c91ac98


Trivial merge