merge of '16171ae55790573667b9c030c80a790d123e19bf'
authorRod Whitby <rod@whitby.id.au>
Sat, 17 Feb 2007 23:41:39 +0000 (23:41 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 17 Feb 2007 23:41:39 +0000 (23:41 +0000)
     and 'cc76392ac5a7b1ccde5981fd2e02094b88a5240a'


Trivial merge