merge of 'b5c1b60665cc492c4cad02a57e687ae33b5ce2ec'
authorRod Whitby <rod@whitby.id.au>
Mon, 24 Dec 2007 05:36:11 +0000 (05:36 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 24 Dec 2007 05:36:11 +0000 (05:36 +0000)
     and 'd31f98aad124b724f9685f080dbcdb5bd97d183f'


Trivial merge