merge of 0e47f1ec02c7c5b2942ab3c42effa12ef8977a20
authorRod Whitby <rod@whitby.id.au>
Fri, 22 Dec 2006 18:17:16 +0000 (18:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 22 Dec 2006 18:17:16 +0000 (18:17 +0000)
     and 3aa45e24e6598b1c8cab608c273fda4cc3c9c704


Trivial merge