merge of 12ecc3256c3cbdb928e09405dec7a0875d4e50f4
authorRod Whitby <rod@whitby.id.au>
Sat, 19 Aug 2006 14:16:09 +0000 (14:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 19 Aug 2006 14:16:09 +0000 (14:16 +0000)
     and 6f7030a7620f1e037f99d9b547d729aab9386f33


Trivial merge