Comment 53 for bug 1030357

Thanks Edward, subscribing ubuntu-sponsors for review and setting to "fix commited" since it's fixed upstream, it would still be good to backport the fix to Ubuntu