merge of 78778155572656a77b8d6701c0de1a1d44e81164
authorRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 23:19:16 +0000 (23:19 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 23:19:16 +0000 (23:19 +0000)
     and 85152a9924438ef00b0d3a9faed2445ed208dfe2


Trivial merge