merge of 828dfc1ed164f5a7dbc310e1f3836850ef4ccb34
authorRod Whitby <rod@whitby.id.au>
Mon, 18 Dec 2006 11:47:15 +0000 (11:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 18 Dec 2006 11:47:15 +0000 (11:47 +0000)
     and cfef3514561ff9ce852948e81d2ab88315d0481c


Trivial merge