merge of 178beef16531b378ceadfaf06c189bf2d0cefe6b
authorRod Whitby <rod@whitby.id.au>
Fri, 8 Sep 2006 13:16:36 +0000 (13:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 8 Sep 2006 13:16:36 +0000 (13:16 +0000)
     and e469bf244bad64c70f8175ad971b2d9a83365bec


Trivial merge