merge of 44124abd48f27837e13fa3f3c4fe61b086c0c08f
authorRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 16:31:17 +0000 (16:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 16:31:17 +0000 (16:31 +0000)
     and e5114fb47d9e76254a369622a1dfe36c0e36d389


Trivial merge