merge of 586fdd7227ffeb6da33dc013048c195045257c16
authorRod Whitby <rod@whitby.id.au>
Mon, 18 Dec 2006 09:33:07 +0000 (09:33 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 18 Dec 2006 09:33:07 +0000 (09:33 +0000)
     and f53d1f05c8a2139aa5ce642dbd11afd644ca9a43


Trivial merge