merge of 26ab4051ec6ee9153656e1ea57a1ea5c53aad6ce
authorRod Whitby <rod@whitby.id.au>
Tue, 12 Dec 2006 17:47:15 +0000 (17:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 12 Dec 2006 17:47:15 +0000 (17:47 +0000)
     and 51024648153c2f14a1c0226e4ace856d5c21016b


Trivial merge