merge of '14b470b8393c6f8fc91c520b519c4568090174a8'
authorRod Whitby <rod@whitby.id.au>
Thu, 22 Mar 2007 22:30:33 +0000 (22:30 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 22 Mar 2007 22:30:33 +0000 (22:30 +0000)
     and 'b451b371edee2ec7da2bd9be75e747f85e99cfe2'


Trivial merge