merge of add0b992da90062461f1e0cac228c2846af2e1bd
authorRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 14:47:40 +0000 (14:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 14:47:40 +0000 (14:47 +0000)
     and b66f8aa97a30d7b5f6212f1847e4d269bb2942eb


Trivial merge