merge of 55cb79e3cde4287346444fc46cb7dc53a191d5aa
authorRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 11:47:44 +0000 (11:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 11:47:44 +0000 (11:47 +0000)
     and b1b91c6f4e23fff4113ebe6b978f427acafb1ddb


Trivial merge