merge of '0d2c2ae12399572f307717129530d4a0a9025441'
authorRod Whitby <rod@whitby.id.au>
Mon, 5 Feb 2007 21:30:45 +0000 (21:30 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 5 Feb 2007 21:30:45 +0000 (21:30 +0000)
     and '9ac2773ad49d5dfb40ed48ebf867fcf938804ff2'


Trivial merge