merge of '709567d645f4e7cbcb5c96f0cf8b99276d2e9318'
authorRod Whitby <rod@whitby.id.au>
Mon, 24 Sep 2007 08:01:18 +0000 (08:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 24 Sep 2007 08:01:18 +0000 (08:01 +0000)
     and 'bbea886577d16293379de278796e667a3ca5aac3'


Trivial merge