merge of 11b7563c2a1e1db7d344182fdb34864de1d1f04c
authorRod Whitby <rod@whitby.id.au>
Thu, 31 Aug 2006 22:01:17 +0000 (22:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 31 Aug 2006 22:01:17 +0000 (22:01 +0000)
     and 416f85f7a01f217e51a4cde5c03a5c7436c29749


Trivial merge