Comment 7 for bug 531376

This upload changes quite a bit more than just fixing this bug, but does not link to corresponding bug reports. Can you please reupload with just one focused patch for this bug, or alternatively reupload with adding the bug references to the other bugs, and preparing the other bugs for SRUs? (Please note that you should _not_ open new bugs; if a bug hasn't been reported already for a particular issue, it's not worth SRUing).