Comment 6 for bug 768636

I've not committed it yet; It's just a line,. but since I didn't know if this was considered good or not (thankfully Ubuntu is so open to changes!), I just asked it before.

So, I'll push a branch with this and other fixes soon (I hope).