merge of a3ed3473c082ebf75ecc350ebbd0c832e9faaf1a
authorRod Whitby <rod@whitby.id.au>
Thu, 21 Dec 2006 11:32:24 +0000 (11:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 21 Dec 2006 11:32:24 +0000 (11:32 +0000)
     and d3b644b9c422f6f7bd0583dec47febae4c479338


Trivial merge