Ubuntu

Comment 6 for bug 556253

For convenience, this is the complete diff between -18 and 19 (with the timestamps filtered out)