Ubuntu

Comment 58 for bug 120281

(From update of attachment 260183)
this looks good to me, Tuukka and David have already given it a pretty good review.

I haven't had a chance to test it myself though...

Thanks for the patch!