merge of '02c65976b427810565e51bb9c833661ff51fbd96'
authorRod Whitby <rod@whitby.id.au>
Sat, 7 Apr 2007 22:47:11 +0000 (22:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 7 Apr 2007 22:47:11 +0000 (22:47 +0000)
     and '52a3418d782cb7fcc2581f5041a10b2044d0db76'


Trivial merge