merge of '9854932ee8e3c0cfaf427abbdf5b804b7f7f9d91'
authorRod Whitby <rod@whitby.id.au>
Sun, 4 Feb 2007 21:00:19 +0000 (21:00 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 4 Feb 2007 21:00:19 +0000 (21:00 +0000)
     and 'd7d5cb097f959159a7ba2d55828e3be38f7830dd'


Trivial merge