merge of 716dc25622b5d7b692780c2376d47847483c9027
authorRod Whitby <rod@whitby.id.au>
Sun, 17 Dec 2006 15:32:16 +0000 (15:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 17 Dec 2006 15:32:16 +0000 (15:32 +0000)
     and 8c72f9016608a1ea85504764eb02365432d2a2ce


Trivial merge