merge of ac6e8d15cf5ae7a73c08461735cc5b67f8327d2b
authorRod Whitby <rod@whitby.id.au>
Tue, 2 Jan 2007 04:26:43 +0000 (04:26 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 2 Jan 2007 04:26:43 +0000 (04:26 +0000)
     and d6ffec8e4eb73fb29b2514e3e31be33cfa76542e


Trivial merge