merge of 6b6561dd74bdfe32b4ff1ce88d53f233096e3a3f
authorRod Whitby <rod@whitby.id.au>
Mon, 28 Aug 2006 18:16:40 +0000 (18:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 28 Aug 2006 18:16:40 +0000 (18:16 +0000)
     and f68e3cc92daed9f7a91b2debef768da7698730e4


Trivial merge