merge of '12c98ff43108305898021dff24c358c5f6cbbfb1'
authorRod Whitby <rod@whitby.id.au>
Thu, 6 Sep 2007 22:07:26 +0000 (22:07 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 6 Sep 2007 22:07:26 +0000 (22:07 +0000)
     and '6671135b86ee827f25c322906b6251e88e4a5b32'


Trivial merge