Backporting changeset from 7 to 6 for bugfix

[Joe Darcy]

Joe Darcy wrote:
> Andrew John Hughes wrote:
>> On 10 June 2010 22:17, Joe Darcy <joe.darcy at oracle.com> wrote:
>>  

[...]
>>
>> Ok.  I used the Oracle copyright on those files introduced in the
>> patches above, rather than the original.
>>
>>   
>
> Sounds good.
>
> However, I'm unforunately not seeing these changes in the repository 
> yet; was there an issue with your push?
>
> -Joe
>

Okay; the changes have come through now.

-Joe