merge of '634b0214148424e84159707c395801ad41e82725'
authorRod Whitby <rod@whitby.id.au>
Tue, 26 Dec 2006 04:14:51 +0000 (04:14 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 26 Dec 2006 04:14:51 +0000 (04:14 +0000)
     and '97e37e0de018f0f2400e67f30a5073cb921b1d18'


Trivial merge