merge of '19c613da071b81eb9a8cfa3827ef66a439c4848d'
authorRod Whitby <rod@whitby.id.au>
Fri, 16 Mar 2007 15:58:22 +0000 (15:58 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 16 Mar 2007 15:58:22 +0000 (15:58 +0000)
     and '89bba4214b89c81228e40df8ed3708f6d2540e9a'


Trivial merge