merge of '26c11eced35769b1c0bbf0d0f40726505128a158'
authorRod Whitby <rod@whitby.id.au>
Fri, 8 Jun 2007 00:51:10 +0000 (00:51 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 8 Jun 2007 00:51:10 +0000 (00:51 +0000)
     and '98d522eb453e1ea4e6d6f1d2211611fd8157688c'


Trivial merge