Comment 6 for bug 525508

@Damjan - do you have any objections if we commit the alternative patch from comment 5, or do you have a specific reason for preferring the original patch from comment 4?
    - in either case you will be given credit for the fix, since you took the initiative to fix it and since your original proposal worked.