Comment 9 for bug 914788

I looked at the changes George proposed and they looked ok. I prepared a branch with those and another patch I wanted to get re-freshed+activated for quite some time. Maybe we can get those reviewed and uploaded before the next security upload renders the branch less useful. ;)