merge of 'a03b7681c989a843291fbb5bb23b5cd2ab067714'
authorRod Whitby <rod@whitby.id.au>
Wed, 3 Jan 2007 06:46:55 +0000 (06:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 3 Jan 2007 06:46:55 +0000 (06:46 +0000)
     and 'e5f0e1fc961b386324024cff442cfd823afa42ec'


Trivial merge