merge of 'cdfb16fa120107504979a268988c8e742fb9ee27'
authorRod Whitby <rod@whitby.id.au>
Tue, 5 Jun 2007 00:36:26 +0000 (00:36 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 5 Jun 2007 00:36:26 +0000 (00:36 +0000)
     and 'fa1c000d2eb11e81b0552935ffbdfcbf497dde8a'


Trivial merge