Ubuntu

Comment 68 for bug 120281

(From update of attachment 260183)
sorry, this one got past me. Looks good, thx for the patch.