merge of 11629dc197196189f4cf0e12925a0a47fd9839ef
authorRod Whitby <rod@whitby.id.au>
Fri, 8 Sep 2006 21:31:32 +0000 (21:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 8 Sep 2006 21:31:32 +0000 (21:31 +0000)
     and e999e3205cfe7ada12266cc57fa4782ff84b6b61


Trivial merge