merge of 745bb2e79245e366a387e1a95f725b42db2031c0
authorRod Whitby <rod@whitby.id.au>
Wed, 13 Dec 2006 11:17:08 +0000 (11:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 13 Dec 2006 11:17:08 +0000 (11:17 +0000)
     and e594e05813925fb91cc0ec2578ce0766580b3126


Trivial merge