Comment 31 for bug 292606

I'm a bit confused here. The last patch in comment 29 looks weird and does not incorporate Alberto's latest proposed change.

Alberto, can you please attach a complete and tested patch, and re-subscribe the sponsoring team once its ready? Thanks!