merge of 00ab42cecad6f3cff7e430dfe1e456ffab6ee08c
authorRod Whitby <rod@whitby.id.au>
Fri, 29 Dec 2006 12:03:38 +0000 (12:03 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 29 Dec 2006 12:03:38 +0000 (12:03 +0000)
     and 08852d3ee921e5b54ef924285cd0ed124cb83e31


Trivial merge