merge of '1322f90b18589872dfe43f3e8fb8fafff1f58e20'
authorRod Whitby <rod@whitby.id.au>
Tue, 6 Feb 2007 07:38:17 +0000 (07:38 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 6 Feb 2007 07:38:17 +0000 (07:38 +0000)
     and '1e9ea5837bfd496b91787865dfdb897abb24e773'


Trivial merge