merge of d0a4ca99d60eab8fc98b8cfdcc8d85e1a07bb5ce
authorRod Whitby <rod@whitby.id.au>
Mon, 11 Dec 2006 21:47:16 +0000 (21:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 11 Dec 2006 21:47:16 +0000 (21:47 +0000)
     and dc5138ded31c9c1aacd6c0bf37d83ec11d95747c


Trivial merge