Comment 3 for bug 301770

For the record, upstream wasn't happy with my original approach, so I updated the patch and the -common infrastructure, and sent it upstream again. I'll wait for some more feedback before I upload, just to avoid having people actually put it in use and then having it to change later.