Comment 4 for bug 130925

Quick status update for superm1:

This is commited in the trunk branch, but I haven't committed/ported it to the -fixes branch yet. It shouldn't be a problem to port it, I just hanve't done it yet.

Also, those changes are untested (by me), but AFAIK they were shipped with latest trunk and I haven't heard any complaints yet. If you look at the code, there's not much that can break. If you want, you can commit them to -fixes.