merge of 8ae3b74089bdea35b9334a38675649e82f70a625
authorRod Whitby <rod@whitby.id.au>
Tue, 12 Dec 2006 20:19:38 +0000 (20:19 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 12 Dec 2006 20:19:38 +0000 (20:19 +0000)
     and aa6010d679e0e80d63f4e63191b66e5759482858


Trivial merge