merge of 056a776ee239ad24315d1cf23c116ef607815320
authorRod Whitby <rod@whitby.id.au>
Mon, 18 Dec 2006 17:47:27 +0000 (17:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 18 Dec 2006 17:47:27 +0000 (17:47 +0000)
     and 232f936c8e8a43979de82996c328acfa35daf9cb


Trivial merge